Skip to content

Commit 2332c16

Browse files
committed
Merge branch 'release/0.8.5' into master
2 parents b9dec8c + 75fcdbd commit 2332c16

106 files changed

Lines changed: 1717 additions & 229 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.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
/target/
22
application.yml
3+
logs

.settings/org.eclipse.jdt.core.prefs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
1010
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
11+
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1112
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1213
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
14+
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
1315
org.eclipse.jdt.core.compiler.release=disabled
1416
org.eclipse.jdt.core.compiler.source=1.8

LICENSE_HEADER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ContainerProxy
22

3-
Copyright (C) 2016-2019 Open Analytics
3+
Copyright (C) 2016-2020 Open Analytics
44

55
===========================================================================
66

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ It is the engine that powers a.o. [ShinyProxy](https://shinyproxy.io) but can be
1818

1919
Learn more at https://containerproxy.io (in progress)
2020

21-
#### (c) Copyright Open Analytics NV, 2017-2019 - Apache License 2.0
21+
#### (c) Copyright Open Analytics NV, 2017-2020 - Apache License 2.0
2222

2323
## Building from source
2424

doc/api/containerproxy-rest.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
ContainerProxy
44
5-
Copyright (C) 2016-2019 Open Analytics
5+
Copyright (C) 2016-2020 Open Analytics
66
77
===========================================================================
88
@@ -459,4 +459,4 @@
459459
8
460460
]
461461
}
462-
}</code></pre></div></div></li></ul></div></div></div></div></div></div></div></div><div class="panel panel-white resource-modal"><div class="panel-heading"><h4 class="panel-title"><a class="collapsed" data-toggle="collapse" href="#panel_proxyspec__proxyspecid_"><span class="parent">/proxyspec</span>/{proxySpecId}</a> <span class="methods"><a href="#proxyspec__proxyspecid__get"><span class="badge badge_get">get</span></a></span></h4></div><div id="panel_proxyspec__proxyspecid_" class="panel-collapse collapse"><div class="panel-body"><div class="list-group"><div onclick="window.location.href = '#proxyspec__proxyspecid__get'" class="list-group-item"><span class="badge badge_get">get</span><div class="method_description"><p>Get the details of a proxy spec responses</p></div><div class="clearfix"></div></div></div></div></div><div class="modal fade" tabindex="0" id="proxyspec__proxyspecid__get"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button><h4 class="modal-title" id="myModalLabel"><span class="badge badge_get">get</span> <span class="parent">/proxyspec</span>/{proxySpecId}</h4></div><div class="modal-body"><div class="alert alert-info"><p>Get the details of a proxy spec responses</p></div><ul class="nav nav-tabs"><li class="active"><a href="#proxyspec__proxyspecid__get_request" data-toggle="tab">Request</a></li></ul><div class="tab-content"><div class="tab-pane active" id="proxyspec__proxyspecid__get_request"><h3>URI Parameters</h3><ul><li><strong>proxySpecId</strong>: <em>required (string)</em></li></ul></div></div></div></div></div></div></div></div></div></div></div><div class="col-md-3"><div id="sidebar" class="hidden-print affix" role="complementary"><ul class="nav nav-pills nav-stacked"><li><a href="#proxy">/proxy</a></li><li><a href="#proxyspec">/proxyspec</a></li></ul></div></div></div></div></body></html>
462+
}</code></pre></div></div></li></ul></div></div></div></div></div></div></div></div><div class="panel panel-white resource-modal"><div class="panel-heading"><h4 class="panel-title"><a class="collapsed" data-toggle="collapse" href="#panel_proxyspec__proxyspecid_"><span class="parent">/proxyspec</span>/{proxySpecId}</a> <span class="methods"><a href="#proxyspec__proxyspecid__get"><span class="badge badge_get">get</span></a></span></h4></div><div id="panel_proxyspec__proxyspecid_" class="panel-collapse collapse"><div class="panel-body"><div class="list-group"><div onclick="window.location.href = '#proxyspec__proxyspecid__get'" class="list-group-item"><span class="badge badge_get">get</span><div class="method_description"><p>Get the details of a proxy spec responses</p></div><div class="clearfix"></div></div></div></div></div><div class="modal fade" tabindex="0" id="proxyspec__proxyspecid__get"><div class="modal-dialog modal-lg"><div class="modal-content"><div class="modal-header"><button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button><h4 class="modal-title" id="myModalLabel"><span class="badge badge_get">get</span> <span class="parent">/proxyspec</span>/{proxySpecId}</h4></div><div class="modal-body"><div class="alert alert-info"><p>Get the details of a proxy spec responses</p></div><ul class="nav nav-tabs"><li class="active"><a href="#proxyspec__proxyspecid__get_request" data-toggle="tab">Request</a></li></ul><div class="tab-content"><div class="tab-pane active" id="proxyspec__proxyspecid__get_request"><h3>URI Parameters</h3><ul><li><strong>proxySpecId</strong>: <em>required (string)</em></li></ul></div></div></div></div></div></div></div></div></div></div></div><div class="col-md-3"><div id="sidebar" class="hidden-print affix" role="complementary"><ul class="nav nav-pills nav-stacked"><li><a href="#proxy">/proxy</a></li><li><a href="#proxyspec">/proxyspec</a></li></ul></div></div></div></div></body></html>

0 commit comments

Comments
 (0)