commit 544c63c86669e45a6b640941eb273edab6661074
author Avery Pennarun <apenwarr@gmail.com> Sat Aug 25 04:35:18 2012 -0400
committer Avery Pennarun <apenwarr@gmail.com> Sat Aug 25 04:35:18 2012 -0400
tree 5ce744f172ab93681557e99deebaa48dd03abca1
parent 314a5bd612990b480715a81fbd2f0ac3bd6b00dd
parent 54685f3fb85bc77163cb51bdc0ec61538792965a

Merge remote-tracking branch 'gfiber-internal/nightingale' into HEAD

* gfiber-internal/nightingale:
  .

Conflicts:
	default.xml

Change-Id: Iada6cfb20fac1ca628471a79a777e125cbcfc64c

default.xml

diff --git a/default.xml b/default.xml
index b5e2150..0cde35a 100644
--- a/default.xml
+++ b/default.xml
@@ -4,7 +4,7 @@
     fetch="https://gfiber-internal.googlesource.com/"
     name="gfiber-internal"
     review="https://gfiber-internal-review.googlesource.com/"/>
-  <default remote="gfiber-internal" revision="nightingale" sync-j="12"/>
+  <default remote="gfiber-internal" revision="octopus" sync-j="12"/>
 
   <project name="manifests" path="manifest"/>
   <project name="toolchains/bruno"/>