cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sgreb...@apache.org
Subject [12/14] cordova-medic git commit: Merge remote-tracking branch 'apache/master' into buildbot
Date Thu, 13 Nov 2014 05:24:52 GMT
Merge remote-tracking branch 'apache/master' into buildbot

Conflicts:
	master.cfg


Project: http://git-wip-us.apache.org/repos/asf/cordova-medic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-medic/commit/a23d3c9b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-medic/tree/a23d3c9b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-medic/diff/a23d3c9b

Branch: refs/heads/master
Commit: a23d3c9b96e48100c77156e98f98580640570642
Parents: 9783c6f 9c31ddb
Author: dmitriy-barkalov <v-dmbark@microsoft.com>
Authored: Tue Nov 11 02:48:54 2014 -0800
Committer: dmitriy-barkalov <v-dmbark@microsoft.com>
Committed: Tue Nov 11 02:48:54 2014 -0800

----------------------------------------------------------------------
 master.cfg | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-medic/blob/a23d3c9b/master.cfg
----------------------------------------------------------------------
diff --cc master.cfg
index cba5a82,92abfc7..53ff72c
--- a/master.cfg
+++ b/master.cfg
@@@ -363,14 -367,14 +363,14 @@@ if(build_android)
  if(build_wp8):
      factory_wp8 = BuildFactory()
      factory_wp8.addSteps(PlatformTest_WP8().get_all_steps())
-     c['builders'].append(BuilderConfig(name="WP8", slavenames=["windows-slave"], factory=factory_wp8))
-     c['builders'].append(BuilderConfig(name="WP8_vs2012_win8", slavenames=["win8-slave"],
factory=factory_wp8))
+     c['builders'].append(BuilderConfig(name="WP8", slavenames=["cordova-windows-slave"],
factory=factory_wp8))
+     c['builders'].append(BuilderConfig(name="WP8_vs2012_win8", slavenames=["cordova-win8-slave"],
factory=factory_wp8))
  
 -if(build_windows8):
 -    factory_windows8 = BuildFactory()
 -    factory_windows8.addSteps(PlatformTest_Windows8().get_all_steps())
 -    c['builders'].append(BuilderConfig(name="Windows8", slavenames=["cordova-windows-slave"],
factory=factory_windows8))
 -    c['builders'].append(BuilderConfig(name="Windows8_vs2012_win8", slavenames=["cordova-win8-slave"],
factory=factory_windows8))
 +if(build_windows):
 +    factory_windows = BuildFactory()
 +    factory_windows.addSteps(PlatformTest_Windows().get_all_steps())
-     c['builders'].append(BuilderConfig(name="Windows", slavenames=["windows-slave"], factory=factory_windows))
-     c['builders'].append(BuilderConfig(name="Windows8_vs2012_win8", slavenames=["win8-slave"],
factory=factory_windows))
++    c['builders'].append(BuilderConfig(name="Windows", slavenames=["cordova-windows-slave"],
factory=factory_windows))
++    c['builders'].append(BuilderConfig(name="Windows8_vs2012_win8", slavenames=["cordova-win8-slave"],
factory=factory_windows))
  
  if(build_blackberry):
      factory_BlackBerry = BuildFactory()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org


Mime
View raw message