commit 8f1917bd34be3c81f4fc049b4736e4fbe3f1cd0e
Author: Shudong Zhou <shudongzhou@gmail.com>
Date:   Thu Jan 31 00:59:16 2013 -0800

    Fix singleton task initialization

commit dd361d41dafca32cae1f2e8f6be0725633082dc5
Author: Shudong Zhou <shudongzhou@gmail.com>
Date:   Wed Jan 30 21:58:22 2013 -0800

    Send HA role request to switch when master controller gets permission error

commit c18d87699bda09c07707a36e026fb5a4e6301e0d
Author: Shudong Zhou <shudongzhou@gmail.com>
Date:   Wed Jan 30 20:33:51 2013 -0800

    Dampen frequency of HA role transitions

commit ed7c1bd030ce6826510c52427ccea1f8631e09fa
Author: Shudong Zhou <shudongzhou@gmail.com>
Date:   Wed Jan 30 20:04:43 2013 -0800

    Update unit test for HA role change

commit 32dc0b95b34a82902f1309aebbe469b4b713b356
Merge: 4963170 63a85a2
Author: abat <abat@bigswitch.com>
Date:   Wed Jan 30 16:27:28 2013 -0800

    Merge into master from pull request #2414: lower a message level to trace

commit 63a85a28be92ca5c14d826198a572c9e408b0343
Author: Kanzhe Jiang <kanzhe.jiang@bigswitch.com>
Date:   Wed Jan 30 14:55:52 2013 -0800

    lower log level to info

commit 49631705e7393452cd6825ae126e053c6ff3f3a1
Author: Gregor Maier <gregor.maier@bigswitch.com>
Date:   Wed Jan 30 10:10:07 2013 -0800

    Adding debug logging to SwitchPortMatcher. Tweak log levels.

    We'll now log when SwitchPortMatcher can't find the switch or port for a
    packet its trying to match.

commit ca75639f53067087be0b308e3aa72e07bf75d924
Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date:   Tue Jan 29 12:20:13 2013 -0800

    Bug fix: When tunnel links are identified, they should not be added to topology switchportlinks.  Update unit tests.

commit 3ee7da2f062834929212a568bf07cb462eb41979
Author: kwanggithub <kwang@clemson.edu>
Date:   Mon Jan 28 11:51:52 2013 -0800

    refactor loadbalancer to not use StaticFlowEntries

commit a0cac00f334970199ca2af9679d927d69fa539ab
Author: Kanzhe Jiang <kanzhe.jiang@bigswitch.com>
Date:   Sun Jan 27 18:05:23 2013 -0800

    notify listeners for device classification first, then listeners for reconcile.

commit 5925b52aa2f0d7aae290dd22d30626bf81e879c3
Author: Srinivasan Ramasubramanian <srini@bigswitch.com>
Date:   Wed Jan 23 01:24:29 2013 -0800

    Refactoring some methods to better support extensibility.

commit ae577282bdc906262cf3fed44eabf685090ca60e
Merge: 9f1613e 1d88cbf
Author: abat <abat@bigswitch.com>
Date:   Mon Jan 21 17:22:21 2013 -0800

    Merge into master from pull request #2255

commit 9f1613e936c5b9485a798486e19670b8dc2dd8eb
Author: Gregor Maier <gregor.maier@bigswitch.com>
Date:   Sat Jan 19 23:25:48 2013 -0800

    Don't use vlans from devices. Use explicitly specified VLAN.

commit 1d88cbff4bc53f8936145abc8ca653fa0d58c9ce
Author: Ronald Li <ronald.li@bigswitch.com>
Date:   Thu Jan 10 18:08:39 2013 -0800

Add tunnelPortsUpdated variable to help track if tunnel ports were added or not when updates are applied.

Remove three dependent libraries accordingly.

Refactoring of tunnel links/ports, link discovery, forwarding base, and appropriate modifications to unit tests.

Add isOutgoingDiscoveryAllowed(), isIncomingDiscoveryAllowed(), and getDiscoveryActions() as methods to facilitate changes to discovery procedures easily.

commit 3dcd02cfb2f8b3feb07f6c63ded633cf00ec71f1
Merge: cb8ca45 54e49e5
Author: kwanggithub <kwang@clemson.edu>
Date:   Fri Dec 28 13:23:35 2012 -0800

    Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

commit 54e49e5813c04d950ede1d07e22d6508b42ba8df
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:59:32 2012 -0800

    Fixed tab characters issues

commit 6cc3b75f036fbfd9fbd4b6c17d759b8d2bacdefb
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:41:48 2012 -0800

    Fix the merge conflicts and compile warnings/failures

commit 261573a7a4322001849040780c3cd247ef81d4cb
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:23:25 2012 -0800

    This reverts commit 5e115c8ca4b12796f33b26ae6d0909459332f27f.

commit 3c9e71dbfd221accf86162dfdd66caefdfd82a42
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 11:09:31 2012 -0800

    This reverts commit 7a6776833b6a12f84321b2243e6c5ae393676383.

commit 9170f5b0d2eacb44d21cb1df9c4e8f0e202b4bc1
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Fri Dec 28 09:32:56 2012 -0800

    Fix for unit-test failure for Link Discovery Manager test.

commit cb8ca45484cfba13b05ea56ca1dfb6627985bc1b
Merge: a4cdc05 3fbea3d6
Author: kwanggithub <kwang@clemson.edu>
Date:   Thu Dec 27 17:55:22 2012 -0800

    Update Floodlight subtree

    Conflicts:
    	floodlight/src/main/java/net/floodlightcontroller/core/internal/Controller.java (fixed empty lines)

commit a4cdc059ebcd07a0e681dd0d564fb3a35c16eb19
Merge: 3af431d 599a4a33
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Thu Dec 27 17:12:45 2012 -0800

    Merge branch 'master' of github.com:bigswitch/bigswitchcontroller

commit 3af431d401a53fec31a85b6af63836ed155700f0
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Tue Dec 11 18:08:57 2012 -0800

    BT-52 : Code check-in for tcam full handling. This will change the runtime status to reflect tcam full. It will also cleanup the policy.

commit 958f522f7be90aea76ec3f11ac11b89a5587d8b1
Author: Sandip Shah <sandip.shah@bigswitch.com>
Date:   Wed Nov 28 12:59:19 2012 -0800

    Commit

This reverts commit f10162148b078c25020ea3523981765c42bef2c7.