Commit graph

7242 commits

Author SHA1 Message Date
Richard Peter
3998dac2f0 Omaha #3300 Fix merge of OB_14.3.1-25m
Change-Id: Ia9afe6316f3dac301caf97a6868d1baaf179f632

Former-commit-id: f5dd25c8e4 [formerly a4bfd2d28b] [formerly f5dd25c8e4 [formerly a4bfd2d28b] [formerly a9562d992c [formerly 110499cec453532545431a6fa05057f47af66ed2]]]
Former-commit-id: a9562d992c
Former-commit-id: 901877ec7a [formerly 1be207dccb]
Former-commit-id: 1ec3bdd877
2014-10-07 16:32:48 -05:00
Richard Peter
7bb803b504 Merge "Omaha #3702 register database plugin to fxa database." into omaha_14.4.1
Former-commit-id: ee86734625 [formerly 1adac05f5a] [formerly ee86734625 [formerly 1adac05f5a] [formerly 1bc24c3be2 [formerly 0ceea4d3d7e36160a70ea9f7f5256d94cd2778b5]]]
Former-commit-id: 1bc24c3be2
Former-commit-id: 4f056d76c8 [formerly c6cb389a3d]
Former-commit-id: 327d82ed02
2014-10-07 15:13:11 -05:00
Nathan Bowler
658f943995 Omaha #3594 Update profiler script to use DAF.
Change-Id: Id0553c1c8745ae4371776fcdb4ec610f8f142ab0

Former-commit-id: 8e3ef542bf [formerly 1fd0ece81a] [formerly 8e3ef542bf [formerly 1fd0ece81a] [formerly e7f86f19c1 [formerly 3c55fd78ca42a04ee0b0a9bbb88034c83f30e583]]]
Former-commit-id: e7f86f19c1
Former-commit-id: db1c0f21b6 [formerly a23f95abdc]
Former-commit-id: eaf614ae66
2014-10-07 15:23:38 -04:00
Sean Webb
89720ee6a6 Merge "ASM #15672 - fixed script to allow for full path of input file to be passed" into asm_14.3.1
Former-commit-id: c90be3ba42 [formerly c3f3140c4f] [formerly c90be3ba42 [formerly c3f3140c4f] [formerly 01b52daea2 [formerly 986a78cef3d8814e04035b00545a289171c7cc8a]]]
Former-commit-id: 01b52daea2
Former-commit-id: 8fa1b81841 [formerly e72d2cdc73]
Former-commit-id: 4659b14c23
2014-10-07 14:04:58 -05:00
Kevin.Johnson
99b25084ee ASM #15672 - fixed script to allow for full path of input file to be passed
Change-Id: Id4d9b71aaa8fb5ba26f5fc940e43ad149305cbae

Former-commit-id: dcecf025a2 [formerly 355274e7ac] [formerly dcecf025a2 [formerly 355274e7ac] [formerly 5cf5cac9f7 [formerly 0982ab6536679921a6afdc85166fe57e92aeac63]]]
Former-commit-id: 5cf5cac9f7
Former-commit-id: 617128a462 [formerly b0e68c1ed1]
Former-commit-id: 6698928cff
2014-10-07 14:55:41 -04:00
Nate Jensen
4126b426eb Merge "Omaha #3668 grid data request uses thread pool" into omaha_14.4.1
Former-commit-id: 0bfc7514a4 [formerly 70521e80f8] [formerly 0bfc7514a4 [formerly 70521e80f8] [formerly 6d0d6c2a96 [formerly a75ecea2121d1c030a7acb4ba50095a6d2769c01]]]
Former-commit-id: 6d0d6c2a96
Former-commit-id: 52e7dd82c0 [formerly 5051b47832]
Former-commit-id: 541e10e9d6
2014-10-07 13:54:08 -05:00
Nate Jensen
12e3c3ff75 Merge "Omaha #3690 added tool to remove empty localization dirs" into omaha_14.4.1
Former-commit-id: affc326eb7 [formerly 11f460f876] [formerly affc326eb7 [formerly 11f460f876] [formerly 726eea342f [formerly cdeea610953d82fe2b380341b3059b15b6ecd1ff]]]
Former-commit-id: 726eea342f
Former-commit-id: 4267d54502 [formerly 557c040868]
Former-commit-id: bf0eb369b3
2014-10-07 13:53:43 -05:00
Nate Jensen
6e2dc7f7d3 Merge "Omaha #2618 Deleted points don't get removed from the selected list" into omaha_14.4.1
Former-commit-id: e63de52465 [formerly c066e8264d] [formerly e63de52465 [formerly c066e8264d] [formerly b0f025c0df [formerly 60155e8f96ba20204c6049206ef35a840f64a767]]]
Former-commit-id: b0f025c0df
Former-commit-id: 0b10454635 [formerly b63050a0e9]
Former-commit-id: 416a45b417
2014-10-07 13:53:33 -05:00
Nate Jensen
4ff50c4c86 Merge "Omaha #3594 Add original, unaltered Profiler scripts." into omaha_14.4.1
Former-commit-id: e3a1adb7f2 [formerly 1e16abcfcd] [formerly e3a1adb7f2 [formerly 1e16abcfcd] [formerly 09cf5de2dd [formerly 747f8fc91e2ff977724f634b6e610c96150cb4ad]]]
Former-commit-id: 09cf5de2dd
Former-commit-id: 38be3b94b7 [formerly 0425092c20]
Former-commit-id: ef4883bda6
2014-10-07 13:52:36 -05:00
Nathan Bowler
b4da44c655 Omaha #3594 Add original, unaltered Profiler scripts.
Change-Id: Iea71e2fa91881c31b67e0f1fb1fd89c8b28da1e9

Former-commit-id: adecc6efa4 [formerly ab2e0edb82] [formerly adecc6efa4 [formerly ab2e0edb82] [formerly b84fee6aed [formerly e57506f274da8a2d917c6cf061e789e50993b5c3]]]
Former-commit-id: b84fee6aed
Former-commit-id: ab157527b9 [formerly efbe205ba8]
Former-commit-id: 36293c548f
2014-10-07 14:40:49 -04:00
Steve Harris
7c4bb336e1 Merge tag 'OB_14.3.1-25m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/actions/FogAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/actions/SafeseasAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/actions/SnowAreaConfigAction.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/BestResResourceData.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FogMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/MonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SSMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/SnowMonitorConfigurationManager.java

Former-commit-id: 39b2199cec [formerly ad4393bea3] [formerly 39b2199cec [formerly ad4393bea3] [formerly c9e37bf440 [formerly 6bb7a7312a22a9585d2f5981d873751879082cb1]]]
Former-commit-id: c9e37bf440
Former-commit-id: fc424d7336 [formerly fc35b7313d]
Former-commit-id: f370a2f54e
2014-10-07 13:35:58 -05:00
Brian Clements
c56ea85517 Omaha #3668 grid data request uses thread pool
Change-Id: I75023960c89f18b87e1bce5a2063c0c6212005ac

Former-commit-id: 48352e964d [formerly 66705190b5] [formerly 48352e964d [formerly 66705190b5] [formerly 42cefd3655 [formerly ccd1d646a175e6a2493def2fb3a22d7109e225a7]]]
Former-commit-id: 42cefd3655
Former-commit-id: 64a3e0898c [formerly 574005859a]
Former-commit-id: 9b83a97637
2014-10-07 13:28:34 -05:00
Mark Peters
dffbaa684d Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e

Former-commit-id: dc27d9252c [formerly 3464751716] [formerly dc27d9252c [formerly 3464751716] [formerly 5ed537572a [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]
Former-commit-id: 5ed537572a
Former-commit-id: 82e2a2bbb5 [formerly c50ae98b5f]
Former-commit-id: c2173b1925
2014-10-07 11:42:44 -05:00
Brian Clements
eda2463f7e Omaha #3398 moved user and userid to core
Change-Id: Id9da2ef25a309c1bbc53f24a59ed2fd1ddbb0407

Former-commit-id: 2637d1b07f [formerly 773619f741] [formerly 2637d1b07f [formerly 773619f741] [formerly ec37971eff [formerly a758b7aff6b30194a3180fddffcefa5d019f2ee5]]]
Former-commit-id: ec37971eff
Former-commit-id: 67bece24d4 [formerly c964fb1e80]
Former-commit-id: c148e3e56f
2014-10-07 10:43:47 -05:00
Brian Clements
49bb8437f6 Omaha #3690 added tool to remove empty localization dirs
Change-Id: Id5ec16147d9f159fa17645da79d29d1f5cbaa701

Former-commit-id: 090a787f8d [formerly f39ffcc63f] [formerly 090a787f8d [formerly f39ffcc63f] [formerly 81c73519c2 [formerly a69773742e571a334ef1fd000ff8311805f9c737]]]
Former-commit-id: 81c73519c2
Former-commit-id: 260b3bab88 [formerly c3d7cd6e7f]
Former-commit-id: 639b2c2510
2014-10-07 08:37:47 -05:00
Ben Steffensmeier
8aac93aeed Omaha #3702 register database plugin to fxa database.
Former-commit-id: 3e0a99aed2 [formerly 6a2b2efb1a] [formerly 3e0a99aed2 [formerly 6a2b2efb1a] [formerly 997bfd689d [formerly 7fa6925c27330262dd0a70afcb77c589718cf1f7]]]
Former-commit-id: 997bfd689d
Former-commit-id: 77c2dcd170 [formerly 7e910088c9]
Former-commit-id: 1c6068ee84
2014-10-06 20:00:19 -05:00
Nate Jensen
2bb8579c76 Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 9c95c255c2 [formerly ef6da2a181] [formerly 9c95c255c2 [formerly ef6da2a181] [formerly b2dcfdf572 [formerly 03ed17c8994b00ea37c1c591760c9b7c452dfcde]]]
Former-commit-id: b2dcfdf572
Former-commit-id: 3caa2b3a21 [formerly 58c8b04318]
Former-commit-id: 41729296aa
2014-10-06 15:53:19 -05:00
Nate Jensen
3c4e7bc755 Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0

Former-commit-id: f8278a9ad3 [formerly 446e0bcdf6] [formerly f8278a9ad3 [formerly 446e0bcdf6] [formerly 9025e166dd [formerly 9dac0fcf997feeecdd8c581ae8fd72581c32d095]]]
Former-commit-id: 9025e166dd
Former-commit-id: 06d562092d [formerly 00adad9546]
Former-commit-id: 7d4f951822
2014-10-06 15:41:42 -05:00
Roger Ferrel
861da21f34 Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 2f8d5263b9 [formerly dfbf07f377] [formerly 2f8d5263b9 [formerly dfbf07f377] [formerly d4ef865375 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]
Former-commit-id: d4ef865375
Former-commit-id: 05c00c7bc7 [formerly 96f484e323]
Former-commit-id: 7afe6d2df6
2014-10-06 15:34:30 -05:00
Qinglu.Lin
0c89c85435 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I2a64416b861d3b374538db8efad51a9509a87892

Former-commit-id: 8372c15a61 [formerly 636f054077] [formerly 8372c15a61 [formerly 636f054077] [formerly 47be3aa143 [formerly 7124fd252f130417a9dcdac148480058d6eb0aba]]]
Former-commit-id: 47be3aa143
Former-commit-id: 58948e5e7c [formerly 4589f2e183]
Former-commit-id: 0ea296f865
2014-10-06 16:05:26 -04:00
Michael Gamazaychikov
488cf033a9 ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410

Former-commit-id: 3851e4c961 [formerly f0b644d92e] [formerly 3851e4c961 [formerly f0b644d92e] [formerly e6d3baaa9c [formerly dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463]]]
Former-commit-id: e6d3baaa9c
Former-commit-id: a2c89ea11c [formerly 4613f0e9d1]
Former-commit-id: 63f3558f48
2014-10-06 15:32:10 -04:00
Steve Harris
afd3d3fa2d Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 06a27b2d3c [formerly 39c5e9c314] [formerly 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]
Former-commit-id: 2db03d95b3
Former-commit-id: bcf1265a16 [formerly 3542caf090]
Former-commit-id: cfd49c8ca0
2014-10-06 13:57:59 -05:00
Nate Jensen
47a9b16164 Merge "Omaha #3675 remove -clean option from installed caves" into omaha_14.4.1
Former-commit-id: 71efead2db [formerly 87d80afd0b] [formerly 71efead2db [formerly 87d80afd0b] [formerly de8b9cf0b8 [formerly 45140e7bd5ac2dcc51351d74dc87119aeac98f3b]]]
Former-commit-id: de8b9cf0b8
Former-commit-id: bfd4adcf63 [formerly e7c6cf60d5]
Former-commit-id: 12ecb3b68a
2014-10-06 11:37:54 -05:00
Darrel Kingfield
f7e8bb0651 VLab Issue #4922 - Rotation Tracks patch check-in
Former-commit-id: 66dcc60acf [formerly 8113b2ba69] [formerly 66dcc60acf [formerly 8113b2ba69] [formerly aa168071aa [formerly 48565726c39ea8139d4a3dfd505732cee2d32b16]]]
Former-commit-id: aa168071aa
Former-commit-id: bed6c606c1 [formerly 4c6e014d54]
Former-commit-id: 4353067ae9
2014-10-06 10:01:36 -05:00
Nate Jensen
763e75f35b Merge "Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin" into omaha_14.4.1
Former-commit-id: 24bf870977 [formerly 28545083c5] [formerly 24bf870977 [formerly 28545083c5] [formerly 05ae6c5d9b [formerly ded3f476047f92d48891613e4c0b78d20858f1ff]]]
Former-commit-id: 05ae6c5d9b
Former-commit-id: 7a5bc79ac1 [formerly 8250390a62]
Former-commit-id: 53441b1866
2014-10-06 09:08:03 -05:00
Nate Jensen
f623152a9c Merge "Omaha #3675 remove explicitly declaring vm to make alertviz.sh more closely match cave.sh" into omaha_14.4.1
Former-commit-id: b544abb498 [formerly baec32be20] [formerly b544abb498 [formerly baec32be20] [formerly 23c5ea21e4 [formerly 73be758f4ae461539c4a622cf52b7bc73705fc50]]]
Former-commit-id: 23c5ea21e4
Former-commit-id: 3941281bb0 [formerly 88afde5dfa]
Former-commit-id: fe4e43d8d3
2014-10-06 09:07:38 -05:00
Richard Peter
f07a0470ee Omaha #3300 Fix merge of 14.3.1-23
Change-Id: I5cbf187bc5d4ff7c8f0b2f8e33bd8dcc4d0348a9

Former-commit-id: 2422c00fbd [formerly 5a0dc20480] [formerly 2422c00fbd [formerly 5a0dc20480] [formerly b5f23b8b98 [formerly 075f3f69cbf19d298398cb7c481668b97d4dad5d]]]
Former-commit-id: b5f23b8b98
Former-commit-id: 84a1b71e23 [formerly 4ada2c1c77]
Former-commit-id: c6171b84c8
2014-10-03 14:14:16 -05:00
Brian.Dyke
918de34464 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 85d83aefe0 [formerly f440da9c70] [formerly 85d83aefe0 [formerly f440da9c70] [formerly 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]]
Former-commit-id: 92762f46c7
Former-commit-id: 64aef1a783 [formerly 4dbdf9de26]
Former-commit-id: 91f89ee1f6
2014-10-03 14:04:46 -04:00
Steve Harris
e05d31ae36 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java

	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: f4b771ea72 [formerly da463c484e] [formerly f4b771ea72 [formerly da463c484e] [formerly 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 306826aed9 [formerly 523cedbb56]
Former-commit-id: 57f5294f08
2014-10-03 10:18:34 -05:00
Mark Peters
eda9693e85 Omaha #3693 Optimize usage of Patterns in com.raytheon.edex.plugin.obs plugin
Change-Id: I1dc26f81d0a6f39b86eb1e832c7204d8b6ce3348

Former-commit-id: ffe3444650 [formerly 955f21a85c] [formerly ffe3444650 [formerly 955f21a85c] [formerly fb62a1e35b [formerly 475fa37d70d51e5e9538141730fbead4a6b5d88e]]]
Former-commit-id: fb62a1e35b
Former-commit-id: 77da058a9f [formerly 6315da5482]
Former-commit-id: f9d5dca0e5
2014-10-02 15:36:22 -05:00
Brian.Dyke
572bbdd019 Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: db665d3876 [formerly 2a911984f0] [formerly db665d3876 [formerly 2a911984f0] [formerly 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]]
Former-commit-id: 20dd249d2c
Former-commit-id: 46956a01c6 [formerly 72ea2fbe48]
Former-commit-id: a3ccdd9704
2014-10-02 10:44:50 -04:00
Brian.Dyke
e100894074 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 006bdb00ad [formerly 65ad6056b6] [formerly 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]
Former-commit-id: f3f95aabb0
Former-commit-id: d174db3b0c [formerly e77f1e126e]
Former-commit-id: 1d2dfd264a
2014-10-02 10:38:51 -04:00
Brian.Dyke
c853463f73 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d4888adc0f [formerly f47840e4d9] [formerly d4888adc0f [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 277b6e4b36 [formerly 36d377e08d]
Former-commit-id: 7e465baead
2014-10-02 10:24:04 -04:00
Brian.Dyke
0fa5e7da1a Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 31f073ee3a [formerly 4bc465bfbd] [formerly 31f073ee3a [formerly 4bc465bfbd] [formerly 97464ea153 [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]]
Former-commit-id: 97464ea153
Former-commit-id: 0915cb28b0 [formerly e76ee74410]
Former-commit-id: 1d5c3fb6d4
2014-10-02 10:15:34 -04:00
Nate Jensen
e156cf3b33 Omaha #3675 remove explicitly declaring vm to make alertviz.sh more
closely match cave.sh

Change-Id: I930fea4d71c4cf6ec990e059469ed59af69b9662

Former-commit-id: 9f74ca65bc [formerly e964375fcc] [formerly 9f74ca65bc [formerly e964375fcc] [formerly 33e3281d55 [formerly 690868294ab74d5c3b73c12f81534d685bb652aa]]]
Former-commit-id: 33e3281d55
Former-commit-id: 23ebf782f3 [formerly 6670e31705]
Former-commit-id: b0e0632c7a
2014-10-02 08:49:32 -05:00
Nate Jensen
3f7391214f Omaha #3675 remove -clean option from installed caves
Change-Id: I2dc8f63d34e4247ebaa26f23c954d082d7bc4419

Former-commit-id: 694b39c979 [formerly fc60a83082] [formerly 694b39c979 [formerly fc60a83082] [formerly b5d8e0a423 [formerly 9519a47ea459390148d07e97189df86e094c037b]]]
Former-commit-id: b5d8e0a423
Former-commit-id: a77f2a5ff0 [formerly b6aa0ae3fc]
Former-commit-id: a37e67946a
2014-10-02 08:30:25 -05:00
Steve Harris
18d68410e5 Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 09d8955b31 [formerly e201e1a493] [formerly 09d8955b31 [formerly e201e1a493] [formerly cc34483b0b [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]]
Former-commit-id: cc34483b0b
Former-commit-id: 8a627b9bf6 [formerly d711c1b67b]
Former-commit-id: 074e12da64
2014-10-02 08:09:02 -05:00
Nate Jensen
9238cd370f Merge "Omaha #2975 fix mkdirs() bug" into omaha_14.4.1
Former-commit-id: 9e4bd6c1b7 [formerly cddda47923] [formerly 9e4bd6c1b7 [formerly cddda47923] [formerly aa43004f85 [formerly c643d7c706ef39d1c17926b2a99bcfa2e52c3193]]]
Former-commit-id: aa43004f85
Former-commit-id: 00fb5931d1 [formerly 2bca618f67]
Former-commit-id: e6aae5c0cd
2014-10-02 07:57:30 -05:00
Nate Jensen
de77597192 Merge "Omaha #3638 plugin xml for *export.point is now properly included" into omaha_14.4.1
Former-commit-id: dd72c8e139 [formerly 116f6840e2] [formerly dd72c8e139 [formerly 116f6840e2] [formerly 53f2bf8395 [formerly 155fdc66bca15c242345858152fcf0b129e28a6d]]]
Former-commit-id: 53f2bf8395
Former-commit-id: 026a2eaa11 [formerly 96790c0377]
Former-commit-id: 40b23efda4
2014-10-01 15:06:03 -05:00
Shawn.Hooper
5a228f5a5c ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720

Former-commit-id: 22c3fde0ef [formerly f9428ace1f] [formerly 22c3fde0ef [formerly f9428ace1f] [formerly ae02cbc2da [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]]
Former-commit-id: ae02cbc2da
Former-commit-id: 9ecf241616 [formerly f2d7288970]
Former-commit-id: e5b5160a51
2014-10-01 15:58:48 -04:00
Brian.Dyke
ea401b327b Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 0be927be2d [formerly 5ed17c0e24] [formerly 0be927be2d [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]]
Former-commit-id: a4bfbea3c2
Former-commit-id: 4df4eb9c2b [formerly 914da168c8]
Former-commit-id: 8184df119d
2014-10-01 15:36:06 -04:00
Andrew Benak
04c5093eee Omaha #3638 plugin xml for *export.point is now properly included
Change-Id: Ib06ea93a28222eefa1522697e407d725d59be909

Former-commit-id: 8ae0af5c6f [formerly 659f4869bc] [formerly 8ae0af5c6f [formerly 659f4869bc] [formerly 7c7510d471 [formerly 8c3cb6032fe79f68f24eb5dee7f3a820aa475257]]]
Former-commit-id: 7c7510d471
Former-commit-id: c711fa910f [formerly f2cfa613fc]
Former-commit-id: 3e4656a60a
2014-10-01 14:30:28 -05:00
Nate Jensen
91e97ad173 Omaha #2975 fix mkdirs() bug
Change-Id: I003f04748a2470dad7b90804d4c157eba44dbe4f

Former-commit-id: 74883424ca [formerly 319ea78480] [formerly 74883424ca [formerly 319ea78480] [formerly 87d1286a0c [formerly 3f63e3887f21b1cb5eb1ea1bb5225f492e161021]]]
Former-commit-id: 87d1286a0c
Former-commit-id: 3e9cb23496 [formerly b658187cdb]
Former-commit-id: 14da412d3d
2014-10-01 14:22:22 -05:00
Nathan Bowler
8f18ed535e Omaha #3596 Update scripts to use DAF. Always put creatingEntity in returned attributes.
Change-Id: I456ff499ccf9446622d1535323afc0d0d1f9b70d

Former-commit-id: 2d5d90c055 [formerly 368b6341b0] [formerly 2d5d90c055 [formerly 368b6341b0] [formerly e4779f2e66 [formerly d67d1e941b89357e7d86fa0f810a82f9e01f4c27]]]
Former-commit-id: e4779f2e66
Former-commit-id: b52c1bcafd [formerly a72fec1b38]
Former-commit-id: ae5bde3c3d
2014-10-01 14:57:16 -04:00
Nate Jensen
647dc473bf Merge "Omaha #3678 don't enable jmx at alertviz or cave startup" into omaha_14.4.1
Former-commit-id: f7eac5f1db [formerly a5e4190b35] [formerly f7eac5f1db [formerly a5e4190b35] [formerly 3146dd083c [formerly 227ab9d68d59a9899025055a51b278bbcd9123f5]]]
Former-commit-id: 3146dd083c
Former-commit-id: e65065461c [formerly 728328f400]
Former-commit-id: d148780c7c
2014-10-01 11:55:38 -05:00
Nate Jensen
d4b7693f81 Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: fce7d5899f [formerly 482af416b3] [formerly fce7d5899f [formerly 482af416b3] [formerly f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]]
Former-commit-id: f2633a56c0
Former-commit-id: f7a075907c [formerly 18acca9ef8]
Former-commit-id: b5998c975b
2014-10-01 11:53:40 -05:00
Nate Jensen
e4fb2572c2 Merge "Omaha #3596 Adding original, unaltered satellite scripts." into omaha_14.4.1
Former-commit-id: 7a1508ac90 [formerly 7c5b340168] [formerly 7a1508ac90 [formerly 7c5b340168] [formerly 629ab024dc [formerly e0f436a866f2a736b793c3fb2b4fbe770208c6c0]]]
Former-commit-id: 629ab024dc
Former-commit-id: d41f587a8d [formerly 8b4bbbaea0]
Former-commit-id: 0f7912967c
2014-10-01 11:46:51 -05:00
Lee Venable
aabc441f2b Merge "Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing." into omaha_14.4.1
Former-commit-id: 3c26abe355 [formerly d12c4b998e] [formerly 3c26abe355 [formerly d12c4b998e] [formerly aaf3198443 [formerly 7807597daa7cbeb9d988eaadc3539eff876e867a]]]
Former-commit-id: aaf3198443
Former-commit-id: 4390c9cb27 [formerly 5199641313]
Former-commit-id: 0502e5d2bf
2014-10-01 11:45:05 -05:00
Nathan Bowler
91e5e487ee Omaha #3596 Adding original, unaltered satellite scripts.
Change-Id: I6441898e986df707376ee61d5952641dc7e9f266

Former-commit-id: 8f39df9850 [formerly ce2dac6af9] [formerly 8f39df9850 [formerly ce2dac6af9] [formerly 30a565a88b [formerly f52d19b153d443fa643af1d6b763160f0937c603]]]
Former-commit-id: 30a565a88b
Former-commit-id: 89a119ad6f [formerly 92d069371c]
Former-commit-id: c2fd4fa310
2014-10-01 12:31:57 -04:00
Robert Blum
2d7c61f0a8 Omaha #3453 Inline Spellcheck - Fixed issues found while in Testing.
Former-commit-id: 6a775aa2be [formerly a1d23e4198] [formerly 6a775aa2be [formerly a1d23e4198] [formerly d5994a8a6b [formerly 9d9065714e1fffa3b65e0f2ccb724dc1dd7a4e7b]]]
Former-commit-id: d5994a8a6b
Former-commit-id: 4bb7ed8b2f [formerly 6c1676e743]
Former-commit-id: 100e24245f
2014-10-01 10:22:25 -05:00