Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pratid committed Jan 13, 2016
2 parents 7e51018 + a266121 commit 394a2b0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ngsi_adapter/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.3.1
current_version = 1.3.0
commit = True
tag = False

Expand Down
2 changes: 1 addition & 1 deletion ngsi_adapter/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.3.1",
"version": "1.3.0",
"name": "ngsi_adapter",
"description": "Generic NGSI Probe Adapter",
"product": {
Expand Down
2 changes: 1 addition & 1 deletion ngsi_event_broker/.bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 1.4.4
current_version = 1.4.3
commit = True
tag = False

Expand Down
2 changes: 1 addition & 1 deletion ngsi_event_broker/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ m4_define([PRODUCT_NAME], [fiware-monitoring])
m4_define([PRODUCT_AREA], [iotplatform])
m4_define([PRODUCT_RELEASE], [5.2.1])
m4_define([ARTIFACTS_URL], [http://repositories.testbed.fiware.org/repo])
AC_INIT([PRODUCT_NAME-ngsi-event-broker], 1.4.4)
AC_INIT([PRODUCT_NAME-ngsi-event-broker], 1.4.3)
AC_LANG(C)
if test -z "$CFLAGS"; then
# prevent configure from assigning default flags
Expand Down

0 comments on commit 394a2b0

Please sign in to comment.