Update CHANGES and KEYS
diff --git a/CHANGES b/CHANGES
index 894d82e..316ef78 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
-Release Notes - Phoenix - Version 4.1.0
+
+Release Notes - Phoenix - Version 4.1
** New Feature
* [PHOENIX-71] - Support sub-joins
@@ -22,6 +23,30 @@
* [PHOENIX-1101] - Provide a way to create Phoenix Statements on the server side inside a CP
* [PHOENIX-1103] - Remove hash join special case for ChunkedResultIterator
* [PHOENIX-1175] - Add setReadOnly and setFetchSize options
+ * [PHOENIX-1198] - Add ability to pass custom tags to be added to log lines
+
+** Sub-task
+ * [PHOENIX-136] - Support derived tables in from clause
+ * [PHOENIX-177] - Collect usage and performance metrics
+ * [PHOENIX-927] - Support derived tables in joins
+ * [PHOENIX-934] - Make changes to specify index is local
+ * [PHOENIX-935] - create local index table with the same split keys of user table
+ * [PHOENIX-936] - Custom load balancer to colocate user table regions and index table regions
+ * [PHOENIX-937] - Handle puts on local index table
+ * [PHOENIX-955] - Skip region start key at beginning of local index rows
+ * [PHOENIX-994] - Handle scans on local index table in case any best fit covering local index available
+ * [PHOENIX-1004] - 'drop index' should delete index data from local index table
+ * [PHOENIX-1015] - Support joining back to data table row from local index when query condition involves leading columns in local index
+ * [PHOENIX-1038] - Dynamically add INDEX_TYPE column to SYSTEM.CATALOG if not already there
+ * [PHOENIX-1058] - Support index region split on it's corresponding data region split
+ * [PHOENIX-1086] - Document local indexes
+ * [PHOENIX-1099] - Fix performance issues with unit tests.
+ * [PHOENIX-1112] - Atomically rebuild index partially when index update fails
+ * [PHOENIX-1114] - Add user-level documentation for tracing
+ * [PHOENIX-1129] - NotCompliantMBeanException
+ * [PHOENIX-1132] - Merge server side phoenix-hadoop2-compat.jar, phoenix-hadoop-compat.jar and phoenix-<version>.jar
+ * [PHOENIX-1161] - Prevent necessity of clearing region cache on every access for local indexing
+ * [PHOENIX-1196] - Add ability to add custom tracing tags for connections and/or upserts and selects
** Bug
* [PHOENIX-3] - TRUNC method doesn't work on column of datatype timestamp
@@ -110,6 +135,11 @@
* [PHOENIX-1172] - Prevent lock contention in ConnectionQueryServicesImpl. Fix exception handling.
* [PHOENIX-1174] - Rename and move properties using existing convention
* [PHOENIX-1176] - Allow tracing to be turned on globally through config
+ * [PHOENIX-1180] - Rename test classes so they are properly picked up by the test runner
+ * [PHOENIX-1181] - client cache fails to update itself after a table was altered from a diff client
+ * [PHOENIX-1187] - Enable tracing on server
+ * [PHOENIX-1188] - Performance regression for non-aggregate queries
+ * [PHOENIX-1192] - Re-enable reverse scan to prevent order by
** Task
* [PHOENIX-539] - Implement parallel scanner that does not spool to disk
@@ -119,26 +149,6 @@
* [PHOENIX-828] - Detect if split occurs while ORDER BY query is in progress
* [PHOENIX-949] - Replace Filter#filterRow(List) with Filter#filterRowCells(List)
-** Sub-task
- * [PHOENIX-136] - Support derived tables in from clause
- * [PHOENIX-177] - Collect usage and performance metrics
- * [PHOENIX-927] - Support derived tables in joins
- * [PHOENIX-934] - Make changes to specify index is local
- * [PHOENIX-935] - create local index table with the same split keys of user table
- * [PHOENIX-936] - Custom load balancer to colocate user table regions and index table regions
- * [PHOENIX-937] - Handle puts on local index table
- * [PHOENIX-955] - Skip region start key at beginning of local index rows
- * [PHOENIX-994] - Handle scans on local index table in case any best fit covering local index available
- * [PHOENIX-1004] - 'drop index' should delete index data from local index table
- * [PHOENIX-1015] - Support joining back to data table row from local index when query condition involves leading columns in local index
- * [PHOENIX-1038] - Dynamically add INDEX_TYPE column to SYSTEM.CATALOG if not already there
- * [PHOENIX-1058] - Support index region split on it's corresponding data region split
- * [PHOENIX-1086] - Document local indexes
- * [PHOENIX-1099] - Fix performance issues with unit tests.
- * [PHOENIX-1112] - Atomically rebuild index partially when index update fails
- * [PHOENIX-1132] - Merge server side phoenix-hadoop2-compat.jar, phoenix-hadoop-compat.jar and phoenix-<version>.jar
- * [PHOENIX-1161] - Prevent necessity of clearing region cache on every access for local indexing
-
** Test
* [PHOENIX-1136] - Add Integration Tests to verify the fix for PHOENIX-1133
diff --git a/KEYS b/KEYS
index ea1f187..722582c 100644
--- a/KEYS
+++ b/KEYS
@@ -71,3 +71,61 @@
GR2wPntvTGNAWEcuwD1/D1gws5A=
=nO9e
-----END PGP PUBLIC KEY BLOCK-----
+pub 4096R/9461178E 2014-08-20
+uid Mujtaba Chohan (CODE SIGNING KEY) <mujtaba@apache.org>
+sig 3 9461178E 2014-08-20 Mujtaba Chohan (CODE SIGNING KEY) <mujtaba@apache.org>
+sub 4096R/040CE8A4 2014-08-20
+sig 9461178E 2014-08-20 Mujtaba Chohan (CODE SIGNING KEY) <mujtaba@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.11 (GNU/Linux)
+
+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
+b3CCnSyeLFXGUhv1BciOnOYQrgph
+=WOH9
+-----END PGP PUBLIC KEY BLOCK-----
