You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/07/10 15:37:31 UTC
[25/50] [abbrv] incubator-usergrid git commit: Updating CHANGELOG and
applying USERGRID-358 fixes to LICENSE and NOTICE.
Updating CHANGELOG and applying USERGRID-358 fixes to LICENSE and NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/e661a647
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/e661a647
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/e661a647
Branch: refs/heads/two-dot-o-import
Commit: e661a64792bd9c8b7cece2069bcb7e42cc80cd24
Parents: 04605d3
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Jun 8 14:18:50 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Jun 8 14:18:50 2015 -0400
----------------------------------------------------------------------
CHANGELOG | 25 +++++++++++++++++++++++--
LICENSE | 55 +++++++++++++++++++++++++++++++++++++++----------------
NOTICE | 13 ++-----------
3 files changed, 64 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e661a647/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 66c17e1..47a080a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,28 @@
-Usergrid 1.0.1
+
+Usergrid 1.0.2
--------------------------------------------------------------------------------
+Usergrid 1.0.2 is a minor release with bug fixes and small improvements.
+Here are the highlights:
+
+Bugs fixed
+
+* S3 upload fails on OpenJDK and Java 8 (fixed by JClouds upgrade)
+* Asset data deleted when connection to Asset deleted
+* Portal stores app password as clear-text
+
+Improvements
+
+* Cassandra key-space names are now configurable
+
+New features
+
+* ExportAdmins: a new tool to export Admin Users, credentials and organizations
+* ImportAdmins: a new tool to import Admin Users, credentials and organizations
+* Central SSO: Usergrid-Usergrid SSO via new /management/externaltoken end-point
+
+Here's the full list of JIRA issues resolved:
+https://issues.apache.org/jira/issues/?jql=project%3Dusergrid%20and%20fixVersion%3D1.0.2
Usergrid 1.0.1
--------------------------------------------------------------------------------
@@ -28,4 +50,3 @@ Here are the highlights:
* Stack - Build now works with latest versions of Maven.
* Stack - Build now supports property for configurable argline parameters.
* Stack - Build now sets java.awt.headless to prevent forkedbooter popups.
-
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e661a647/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 64c7ebc..dd22519 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,6 @@
+Apache Usergrid itself is licensed under the terms of the Apache License:
+
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -201,6 +203,7 @@
See the License for the specific language governing permissions and
limitations under the License.
+------------------------------------------------------------------------------
USERGRID SUBCOMPONENTS
@@ -213,7 +216,7 @@ IOS SDK
-------
For the SBJson component:
- Copyright (C) 2009-2011 Stig Brautaset. All rights reserved.
+ Copyright (c) Stig Brautaset. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -240,10 +243,10 @@ For the SBJson component:
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
For the SSKeychain component:
+-----------------------------
- Copyright (c) 2010-2014 Sam Soffes, http://soff.es
+ Copyright (c) Sam Soffes, http://soff.es
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -264,8 +267,8 @@ For the SSKeychain component:
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
+Other components:
+-----------------
This product bundles SBJson, which is available under a "3-clause BSD" license.
For details, see sdks/ios/UGAPI/SBJson/ .
@@ -273,19 +276,39 @@ For details, see sdks/ios/UGAPI/SBJson/ .
This product bundles SSKeychain, which is available under a "MIT/X11" license.
For details, see sdks/ios/UGAPI/SSKeychain/.
-This product bundles angular-senario.js, part of jQuery JavaScript Library v1.10.2
-which Includes Sizzle.js Copyright 2005, 2013 jQuery Foundation, Inc. and
-other contributors. Released under the MIT license.
+This product bundles angular-scenario.js, part of jQuery JavaScript Library
+which Includes Sizzle.js Copyright (c) jQuery Foundation, Inc. and others.
+Released under the MIT license.
+
+This product bundles angular.js
+Copyright(c) Google, Inc. Released under the MIT license.
+
+This product bundles Bootstrap Copyright (c) Twitter, Inc
+Licensed under the MIT license.
+
+This product bundles jquery-ui
+Licensed under MIT license.
+
+This product bundles jquery
+Licensed under MIT license.
+
+This product bundles mocha.
+All rights reserved. Licensed under MIT.
+Copyright (c) TJ Holowaychuk <tj...@vision-media.ca>
+
+This product bundles SSToolkit.
+Copyright (c) Sam Soffes. All rights reserved.
+These files can be located within the /sdks/ios package.
+
+The product bundles Intro.js (MIT licensed)
+Copyright (c) usabli.ca - A weekend project by Afshin Mehrabani (@afshinmeh)
-This product bundles angular.js, specifically AngularJS v1.2.5 (c) 2010-2014
-Google, Inc. Released under the MIT license.
+This product bundles NPM MD5 (BSD-3 licensed)
+Copyright (c) Paul Vorbach and Copyright (C), Jeff Mott.
-This product bundles Bootstrap v2.3.2 Copyright 2012 Twitter, Inc
-Licensed under the Apache License v2.0
+This product bundles NewtonSoft.Json under MIT license
-This product bundles jquery-ui-1.8.9. Licensed under MIT license.
+This product bundles NSubsttute under BSD license
-This product bundles jquery-1.9.1 Licensed under MIT license.
+This product bundles Sphinx under BSD license
-This product bundles mocha. All rights reserved. Licensed under MIT.
-Copyright (c) 2011-2014 TJ Holowaychuk <tj...@vision-media.ca>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/e661a647/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index c1edc86..ef5af71 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,15 +1,6 @@
Apache Usergrid (incubating)
Copyright (c) The Apache Software Foundation.
-This product uses the following software:
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
-
-SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.
-These files can be located within the /sdks/ios package.
-
-Intro.js (MIT licensed)
-Copyright (C) 2013 usabli.ca - A weekend project by Afshin Mehrabani (@afshinmeh)
-
-NPM MD5 (BSD-3 licensed)
-Copyright (C) 2011-2012, Paul Vorbach and Copyright (C) 2009, Jeff Mott.
-