Skip to content

Commit 7dc3adf

Browse files
author
Sumedh Wale
committed
Merge remote-tracking branch 'origin/master' into dmlVALUES
2 parents 51c7a9c + e08c56e commit 7dc3adf

937 files changed

Lines changed: 7780 additions & 1653 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 99 additions & 27 deletions
Large diffs are not rendered by default.

‎build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ allprojects {
7272
apply plugin: "build-time-tracker"
7373

7474
group = 'io.snappydata'
75-
version = '1.1.0-HF-1'
75+
version = '1.1.1'
7676

7777
// apply compiler options
7878
tasks.withType(JavaCompile) {
@@ -108,7 +108,7 @@ allprojects {
108108
scalaBinaryVersion = '2.11'
109109
scalaVersion = scalaBinaryVersion + '.8'
110110
sparkVersion = '2.1.1'
111-
snappySparkVersion = '2.1.1.6'
111+
snappySparkVersion = '2.1.1.7'
112112
sparkDistName = "spark-${sparkVersion}-bin-hadoop2.7"
113113
sparkCurrentVersion = '2.3.2'
114114
sparkCurrentDistName = "spark-${sparkCurrentVersion}-bin-hadoop2.7"
@@ -151,10 +151,10 @@ allprojects {
151151
antlr2Version = '2.7.7'
152152

153153
pegdownVersion = '1.6.0'
154-
snappyStoreVersion = '1.6.3'
154+
snappyStoreVersion = '1.6.4'
155155
snappydataVersion = version
156156
pulseVersion = '1.5.1'
157-
zeppelinInterpreterVersion = '0.7.3.5'
157+
zeppelinInterpreterVersion = '0.7.3.6'
158158

159159
buildFlags = ''
160160
createdBy = System.getProperty('user.name')
@@ -165,7 +165,7 @@ allprojects {
165165
buildDate = new Date().format('yyyy-MM-dd HH:mm:ss Z')
166166
buildNumber = new Date().format('MMddyy')
167167
jdkVersion = System.getProperty('java.version')
168-
sparkJobServerVersion = '0.6.2.9'
168+
sparkJobServerVersion = '0.6.2.10'
169169
eclipseCollectionsVersion = '9.2.0'
170170
fastutilVersion = '8.2.2'
171171

‎cluster/bin/load-snappy-env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
#
4-
# Copyright (c) 2018 SnappyData, Inc. All rights reserved.
4+
# Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License"); you
77
# may not use this file except in compliance with the License. You

‎cluster/bin/snappy-job.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
#
4-
# Copyright (c) 2018 SnappyData, Inc. All rights reserved.
4+
# Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License"); you
77
# may not use this file except in compliance with the License. You

‎cluster/bin/snappy-sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
#
4-
# Copyright (c) 2018 SnappyData, Inc. All rights reserved.
4+
# Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License"); you
77
# may not use this file except in compliance with the License. You

‎cluster/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018 SnappyData, Inc. All rights reserved.
2+
* Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you
55
* may not use this file except in compliance with the License. You

‎cluster/conf/leads.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018 SnappyData, Inc. All rights reserved.
2+
# Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License"); you
55
# may not use this file except in compliance with the License. You

‎cluster/conf/locators.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018 SnappyData, Inc. All rights reserved.
2+
# Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License"); you
55
# may not use this file except in compliance with the License. You

‎cluster/conf/log4j.properties.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018 SnappyData, Inc. All rights reserved.
2+
# Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License"); you
55
# may not use this file except in compliance with the License. You

‎cluster/conf/servers.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2018 SnappyData, Inc. All rights reserved.
2+
# Copyright (c) 2017-2019 TIBCO Software Inc. All rights reserved.
33
#
44
# Licensed under the Apache License, Version 2.0 (the "License"); you
55
# may not use this file except in compliance with the License. You

0 commit comments

Comments
 (0)