Merge remote-tracking branch 'upstream/develop' into develop

CHANGES

@@ -1,9 +1,16 @@
 # Note: keep this file in wiki format for easy pasting to the gcf wiki
 
+gcf 2.11:
+ * Remove bogus check for rspec tag (#885)
+
 gcf 2.10:
  * Changed references to trac.gpolab.bbn.com to point to Github.
    Although those pages mostly still reference trac, that is the future home.
-   These changes include changing where the agg_nick_cache lives. (#814)
+   These changes include changing where the `agg_nick_cache` lives. (#814)
+ * Add some omni design notes (work in progress). (#883)
+ * Document how to create a release. (#871)
+ * Add Debian and RPM packaging configuration (#849)
+ * Update CentOS installation instructions (#853)
 
  * Omni
   * Continue anyway if no aggregate nickname cache can be loaded. (#822)
@@ -21,14 +28,16 @@ gcf 2.10:
    * Thanks to Umar Toseef for the bug report.
   * Calling `getslicecred` while specifying a `slicecredfile` that exists
     no longer means just return that file. Instead, that file will be
-    ignored and, if you specify `-o`, replaced. (#868)
-  * Moved canonical `agg_nick_cache` location to Github. (#814)
+    ignored and, if you specify `-o`, replaced. (#868, #869)
+  * Moved canonical `agg_nick_cache` location to Github. (#814, #882)
+  * Use `urllib2.urlopen` instead of `urllib.urlretrieve` to avoid bad
+    interaction with M2Crypto. (#881)
 
  * Stitcher
   * Catch expiration too great errors from PG AMs and quit. (#828)
   * Bug fix combining manifests involving a fixed endpoint. (#833)
   * Fix up combining manifests using ExoGENI, to ensure the stitching
-    hops list the actual reserved VLAN tags. (#873)
+    hops list the actual reserved VLAN tags. (#873, #876)
   * Support detecting OESS AM using `geni_am_type`. (#835)
   * Do not insist on 2 reciprocal properties on links, allowing more
     flexibility perhaps. (#838)
@@ -41,9 +50,11 @@ gcf 2.10:
     in some cases. (#839)
   * AL2S supports speaks for. Don't exit if using speaksfor and AL2S. (#834)
   * Treat new generic ProtoGENI mapper error code (28) as fatal. (#861)
+  * Fix combining manifests where link is multi AM but not stitched. (#879)
+   * Thanks to Hussam Nasir
 
  * omni-configure
-  * Modify omni-configure to support multi-user systems (#843)
+  * Modify omni-configure to support multi-user systems (#843, #877)
 
  * gcf
   * Add new parameters to decode_urns so that derived delegates can 
@@ -72,11 +83,9 @@ gcf 2.10:
     a proper return value indicating an error occured. (#841)
   * Log the HTTP request line when `--debug`. (#842)
   * Fix some typos in `Provision()` in `am3.py`. (#846)
-  * Add Debian and RPM packaging configuration (#849)
-  * Fix am2 not keeping resources' state updated when creating or deleting Slivers (#848)
+  * Fix am2 not keeping resources' state updated when creating or deleting Slivers (#848, #850)
   * Update generated certificate key size and signature algorithm to more
-    modern values (#851)
-  * Update CentOS installation instructions (#853)
+    modern values (#851, #852)
   * Point people to [email protected] instead of old list.
   * In AM3, fix exception on expire_slivers. Aggregate stores resources, not slivers. (#863)
 

INSTALL.txt

@@ -22,22 +22,22 @@ Section that is different is Section 3
 
       * If you have downloaded the software from the git repository, you can skip this step.
       {{{
-      tar xvfz gcf-2.10.tar.gz
+      tar xvfz gcf-2.11.tar.gz
       }}}
       * Move the gcf directory to the directory where you want to permanently keep gcf. This might be your home directory. [[BR]]If you have `sudo` privileges in your host, you might want to consider moving the gcf package under `/usr/local/bin/` for a cleaner setup. 
       {{{
-      [sudo] mv gcf-2.10 <install-dir>
+      [sudo] mv gcf-2.11 <install-dir>
       }}}
       * Create a symbolic link  called `gcf` to your installation directory. This will make the process of upgrading omni easier.
          - If this is your first time installing gcf, do:
       {{{
       cd <install-dir>
-      rm gcf; ln -s gcf-2.10 gcf
+      rm gcf; ln -s gcf-2.11 gcf
       }}}
          - If you are upgrading your gcf, do:
       {{{
       cd <install-dir>
-      ln -s gcf-2.10 gcf
+      ln -s gcf-2.11 gcf
       }}}
 ==  2. Add GCF to your path == 
 

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2015 Raytheon BBN Technologies
+Copyright (c) 2010-2016 Raytheon BBN Technologies
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and/or hardware specification (the "Work") to