Skip to content

Commit 42c67c2

Browse files
author
OpenShift Bot
authored
Merge pull request #1292 from jwforres/openshift-jvm-1.1.6
Merged by openshift-bot
2 parents d3237d4 + e4caa54 commit 42c67c2

File tree

7 files changed

+133
-5235
lines changed

7 files changed

+133
-5235
lines changed

dist.java/java/404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h4>Connected to <span ng-bind="containerName"></span></h4>
3838
<div ng-include src="viewPartial"></div>
3939
</div>
4040

41-
<script src="libs-b320a1c6ab.js"></script>
41+
<script src="libs-cee83b5806.js"></script>
4242

4343
<!-- add any scripts under dist/ here -->
4444
<script src="app-f38f1f8a14.js"></script>

dist.java/java/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h4>Connected to <span ng-bind="containerName"></span></h4>
3838
<div ng-include src="viewPartial"></div>
3939
</div>
4040

41-
<script src="libs-b320a1c6ab.js"></script>
41+
<script src="libs-cee83b5806.js"></script>
4242

4343
<!-- add any scripts under dist/ here -->
4444
<script src="app-f38f1f8a14.js"></script>

dist.java/java/libs-b320a1c6ab.js

-97
This file was deleted.

dist.java/java/libs-cee83b5806.js

+97
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist.java/java/style.css

+29-5,131
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist.java/java/version.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "openshift-jvm",
3-
"version": "1.1.4",
4-
"commitId": "69bb37390124033fdff239bca0099c7e759963a3",
3+
"version": "1.1.6",
4+
"commitId": "45c894110dd2045c20a9f3a3625930b6a5fd2a5a",
55
"packages": {
66
"angular": {
77
"version": "1.5.11"
@@ -28,7 +28,7 @@
2828
"version": "1.10.0"
2929
},
3030
"bootstrap-switch": {
31-
"version": "3.3.2"
31+
"version": "3.3.3"
3232
},
3333
"bootstrap-touchspin": {
3434
"version": "3.1.2"
@@ -124,7 +124,7 @@
124124
"version": "0.3.6"
125125
},
126126
"matchHeight": {
127-
"version": "0.7.0"
127+
"version": "0.7.2"
128128
},
129129
"moment": {
130130
"version": "2.14.2"

hack/install-deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -e
44

5-
OPENSHIFT_JVM_VERSION=v1.1.4
5+
OPENSHIFT_JVM_VERSION=v1.1.6
66

77
STARTTIME=$(date +%s)
88

0 commit comments

Comments
 (0)