commit ed067dd69709c351de4d749948a34f6c2c1ee3c4
author Avery Pennarun <apenwarr@gmail.com> Sat Aug 25 04:49:08 2012 -0400
committer Avery Pennarun <apenwarr@gmail.com> Sat Aug 25 04:49:08 2012 -0400
tree 2b2b18e617ba9e4eb3fa5ef5ee887bf703115354
parent 544c63c86669e45a6b640941eb273edab6661074

Merge octopus into HEAD.

Change-Id: I6c888b1a50caadbcb3ec29a5ba5867385ad5b4b4

default.xml

diff --git a/default.xml b/default.xml
index 0cde35a..6af8c04 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="octopus" sync-j="12"/>
+  <default remote="gfiber-internal" revision="master" sync-j="12"/>
 
   <project name="manifests" path="manifest"/>
   <project name="toolchains/bruno"/>