From 4242075c335473f8c3fc0b578196bdc878a3b9df Mon Sep 17 00:00:00 2001
From: Stanley Cheung <stanleycheung@google.com>
Date: Fri, 13 Jan 2017 15:23:11 -0800
Subject: [PATCH] PHP: Prepare for 1.1.0 release

---
 package.xml                    | 46 ++++++++++++++++++++++++++++------
 src/php/README.md              |  7 ++++++
 templates/package.xml.template | 46 ++++++++++++++++++++++++++++------
 3 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/package.xml b/package.xml
index 4df15258275..ac5bcc54bf6 100644
--- a/package.xml
+++ b/package.xml
@@ -10,19 +10,20 @@
   <email>grpc-packages@google.com</email>
   <active>yes</active>
  </lead>
- <date>2016-08-22</date>
+ <date>2017-01-13</date>
  <time>16:06:07</time>
  <version>
   <release>1.1.0dev</release>
   <api>1.1.0dev</api>
  </version>
  <stability>
-  <release>stable</release>
-  <api>stable</api>
+  <release>beta</release>
+  <api>beta</api>
  </stability>
  <license>BSD</license>
  <notes>
-- Reject metadata keys which are not legal #7881
+- PHP Proto3 adoption #8179
+- Various bug fixes     
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1215,18 +1216,49 @@ Update to wrap gRPC C Core version 0.10.0
   </release>
   <release>
    <version>
-    <release>1.1.0dev</release>
-    <api>1.1.0dev</api>
+    <release>1.0.1RC1</release>
+    <api>1.0.1RC1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2016-10-06</date>
+   <license>BSD</license>
+   <notes>
+- Reject metadata keys which are not legal #7881
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0.1</release>
+    <api>1.0.1</api>
    </version>
    <stability>
     <release>stable</release>
     <api>stable</api>
    </stability>
-   <date>2016-08-22</date>
+   <date>2016-10-27</date>
    <license>BSD</license>
    <notes>
 - Reject metadata keys which are not legal #7881
    </notes>
   </release>
+  <release>
+   <version>
+    <release>1.1.0dev</release>
+    <api>1.1.0dev</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2017-01-13</date>
+   <license>BSD</license>
+   <notes>
+- PHP Proto3 adoption #8179
+- Various bug fixes     
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/src/php/README.md b/src/php/README.md
index 1b15768d44a..320220d3e4a 100644
--- a/src/php/README.md
+++ b/src/php/README.md
@@ -163,6 +163,13 @@ of this repo. The plugin can be found in the `bins/opt` directory. We are
 planning to provide a better way to download and install the plugin
 in the future.
 
+You can also just build the gRPC PHP protoc plugin by running:
+
+```sh
+$ cd grpc
+$ make grpc_php_plugin
+```
+
 
 ### Client Stub
 
diff --git a/templates/package.xml.template b/templates/package.xml.template
index 32ed3b633e8..80f1a1fe974 100644
--- a/templates/package.xml.template
+++ b/templates/package.xml.template
@@ -12,19 +12,20 @@
     <email>grpc-packages@google.com</email>
     <active>yes</active>
    </lead>
-   <date>2016-08-22</date>
+   <date>2017-01-13</date>
    <time>16:06:07</time>
    <version>
     <release>${settings.php_version.php()}</release>
     <api>${settings.php_version.php()}</api>
    </version>
    <stability>
-    <release>stable</release>
-    <api>stable</api>
+    <release>beta</release>
+    <api>beta</api>
    </stability>
    <license>BSD</license>
    <notes>
-  - Reject metadata keys which are not legal #7881
+  - PHP Proto3 adoption #8179
+  - Various bug fixes     
    </notes>
    <contents>
     <dir baseinstalldir="/" name="/">
@@ -281,18 +282,49 @@
     </release>
     <release>
      <version>
-      <release>${settings.php_version.php()}</release>
-      <api>${settings.php_version.php()}</api>
+      <release>1.0.1RC1</release>
+      <api>1.0.1RC1</api>
+     </version>
+     <stability>
+      <release>beta</release>
+      <api>beta</api>
+     </stability>
+     <date>2016-10-06</date>
+     <license>BSD</license>
+     <notes>
+  - Reject metadata keys which are not legal #7881
+     </notes>
+    </release>
+    <release>
+     <version>
+      <release>1.0.1</release>
+      <api>1.0.1</api>
      </version>
      <stability>
       <release>stable</release>
       <api>stable</api>
      </stability>
-     <date>2016-08-22</date>
+     <date>2016-10-27</date>
      <license>BSD</license>
      <notes>
   - Reject metadata keys which are not legal #7881
      </notes>
     </release>
+    <release>
+     <version>
+      <release>1.1.0dev</release>
+      <api>1.1.0dev</api>
+     </version>
+     <stability>
+      <release>beta</release>
+      <api>beta</api>
+     </stability>
+     <date>2017-01-13</date>
+     <license>BSD</license>
+     <notes>
+  - PHP Proto3 adoption #8179
+  - Various bug fixes     
+     </notes>
+    </release>
    </changelog>
   </package>