Brad Gonzales
4e4ebd83a9
Omaha #3032 updated jdk to java 1.7.0_55
...
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8
Former-commit-id: ad464cc0da
[formerly 91f94499aa
] [formerly ad464cc0da
[formerly 91f94499aa
] [formerly 35f6a5ac25
[formerly 49cc6d83ac5fffc3f737699ab605948fa38117db]]]
Former-commit-id: 35f6a5ac25
Former-commit-id: 6bee1ed107
[formerly f7cf5741b0
]
Former-commit-id: 617e84afa7
2014-05-08 16:15:42 -05:00
Richard Peter
a74bd68f72
Omaha #1458 : Remove reference to cron.properties
...
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29
Former-commit-id: 63114b4f82
[formerly 86aea04167
] [formerly 63114b4f82
[formerly 86aea04167
] [formerly 0430619d7b
[formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]]
Former-commit-id: 0430619d7b
Former-commit-id: 328a48a33d
[formerly 02c77af062
]
Former-commit-id: 400aa47f46
2014-05-08 12:58:49 -05:00
Steve Harris
77030c2fc3
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
...
Former-commit-id: a804a071c0
[formerly ce2b030743
] [formerly a804a071c0
[formerly ce2b030743
] [formerly ff4a6b8122
[formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 532b861bce
[formerly 988ad59a0d
]
Former-commit-id: 47991060bb
2014-05-08 09:50:34 -05:00
Nate Jensen
be64d69f3c
Merge "Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting." into omaha_14.4.1
...
Former-commit-id: 8365e5aa56
[formerly 51608c090e
] [formerly 8365e5aa56
[formerly 51608c090e
] [formerly 4851989a7a
[formerly 3d76d2510d7a0b96f3d8800e2c46727d08ad1fa6]]]
Former-commit-id: 4851989a7a
Former-commit-id: 6a71446d52
[formerly 80d97584d3
]
Former-commit-id: af81eecb2d
2014-05-08 09:36:04 -05:00
Richard Peter
8c41358d2c
Omaha #1458 : Break-out cron.properties.
...
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528
Former-commit-id: ad3f6c4af3
[formerly 6469ae94ed
] [formerly ad3f6c4af3
[formerly 6469ae94ed
] [formerly 348bc25760
[formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]]
Former-commit-id: 348bc25760
Former-commit-id: c9d8bfdd06
[formerly 95488f49b1
]
Former-commit-id: 284e1b762d
2014-05-08 09:18:49 -05:00
Richard Peter
28d5614351
Omaha #2782 : Update thread based logging
...
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8
Former-commit-id: 242716fb0f
[formerly d5ec01f7c0
] [formerly 242716fb0f
[formerly d5ec01f7c0
] [formerly adff7b5684
[formerly fe464020d287bbf21b7bc04402d31c97114c195b]]]
Former-commit-id: adff7b5684
Former-commit-id: 741710881f
[formerly 7a7b65860b
]
Former-commit-id: 401a880686
2014-05-08 09:06:31 -05:00
Steve Harris
2b29fec8d6
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
Former-commit-id: ddd6e35478
[formerly e37e40ed19
] [formerly ddd6e35478
[formerly e37e40ed19
] [formerly b7a1bda98c
[formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: 7a7c1167c2
[formerly 9591532ffd
]
Former-commit-id: 049716e54d
2014-05-07 16:01:53 -05:00
Everett Kladstrup
dffec9a07f
Omaha #3133 Remove some unecessary dependencies
...
* Remove viz.core dependency from uf.common.ohd
* Remove org.osgi.framework dependency from uf.edex.ndm
* Remove non-existant activator from uf.edex.ndm manifest
Former-commit-id: 516a50a6a1
[formerly 3a00185e3c
] [formerly 516a50a6a1
[formerly 3a00185e3c
] [formerly b4a76a575a
[formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]]
Former-commit-id: b4a76a575a
Former-commit-id: a1070cc1ac
[formerly ce743b3c43
]
Former-commit-id: 279be89f4b
2014-05-07 12:54:37 -05:00
Ben Steffensmeier
d02dfbb11f
Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
...
Former-commit-id: 462ec63608
[formerly 18ec643a30
] [formerly 462ec63608
[formerly 18ec643a30
] [formerly 973c6fdb55
[formerly 3bd0a076add20c38fad41461295fb430e8ceb5cb]]]
Former-commit-id: 973c6fdb55
Former-commit-id: 3e9e6abde2
[formerly 0bd28752bc
]
Former-commit-id: ed9993067e
2014-05-06 18:06:44 -05:00
Nate Jensen
d1493a3a82
Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
...
Former-commit-id: be75956418
[formerly ddb3610e24
] [formerly be75956418
[formerly ddb3610e24
] [formerly 69b6c9426f
[formerly 31d9df701d689ceaf76c9d241d36df5c9c463bb3]]]
Former-commit-id: 69b6c9426f
Former-commit-id: f2e1ee0aeb
[formerly 7360ee5c1a
]
Former-commit-id: 7d8a767030
2014-05-06 17:29:45 -05:00
Nate Jensen
76750c319a
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
...
Former-commit-id: daac0701fc
[formerly d271dfb1a5
] [formerly daac0701fc
[formerly d271dfb1a5
] [formerly 0f1cab916a
[formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 89621db281
[formerly 70f70371b1
]
Former-commit-id: 12f88d14bf
2014-05-06 17:09:56 -05:00
Nate Jensen
cf09a6729c
Issue #3101 fix some derived parameters on win64 platform
...
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86
Former-commit-id: 49d34cc4e4
[formerly 5191b61b30
] [formerly 49d34cc4e4
[formerly 5191b61b30
] [formerly aa7c1fac90
[formerly 4659c0240aa31b615bc50228906d514f47a72f94]]]
Former-commit-id: aa7c1fac90
Former-commit-id: 815aa21d8e
[formerly 8c1748d370
]
Former-commit-id: b708774e64
2014-05-06 17:08:04 -05:00
Everett Kladstrup
99fd65216e
Omaha #3112 Fix adding classes to WFS jaxb
...
* Rebuild JAXBContext after adding additional classes
* Set output directory in build.properties to fix deploy location
* Remove unecessary dependencies from wfs manifest
Former-commit-id: 2ee2db6f38
[formerly 1184e77f1a
] [formerly 2ee2db6f38
[formerly 1184e77f1a
] [formerly aedb166b4d
[formerly bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1]]]
Former-commit-id: aedb166b4d
Former-commit-id: 5f378b30f0
[formerly 08e8a4a60a
]
Former-commit-id: 8a4e0f8d71
2014-05-06 17:07:23 -05:00
Ben Steffensmeier
b978e0fc1d
Issue #3117 update satellite inventory for new sectors or elements.
...
Former-commit-id: e70a6999b7
[formerly bbbf957ba8
] [formerly e70a6999b7
[formerly bbbf957ba8
] [formerly 70df0ee87e
[formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]
Former-commit-id: 70df0ee87e
Former-commit-id: 81916ecdb6
[formerly 945fe1db2f
]
Former-commit-id: a39b05ac71
2014-05-06 16:19:58 -05:00
Nate Jensen
3aa1481c98
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
...
Former-commit-id: 26f47e3b00
[formerly a583493711
] [formerly 26f47e3b00
[formerly a583493711
] [formerly 8f8ea5d014
[formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: 4f3570324a
[formerly f1c48f10b1
]
Former-commit-id: a20245a64d
2014-05-06 16:15:41 -05:00
Richard Peter
fc1f958e5b
Issue #2726 : update smartInit threads to 1
...
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0
Former-commit-id: 884562700a
[formerly 03ab7599de
] [formerly 884562700a
[formerly 03ab7599de
] [formerly 611c010968
[formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]]
Former-commit-id: 611c010968
Former-commit-id: be288505e0
[formerly 4f2d470801
]
Former-commit-id: a03997122b
2014-05-06 15:54:23 -05:00
Nate Jensen
17ddc5d8e5
Issue #2060 genericize DataURIFieldConverter
...
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4
Former-commit-id: 7701820902
[formerly ff6c77420c
] [formerly 7701820902
[formerly ff6c77420c
] [formerly 87b6df4840
[formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]]
Former-commit-id: 87b6df4840
Former-commit-id: d1a040b9c2
[formerly a6363fc3d4
]
Former-commit-id: 5f08921768
2014-05-06 13:10:48 -05:00
Nate Jensen
c8cc3b1b8e
Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
...
Former-commit-id: d83fad0054
[formerly 0e3876de34
] [formerly d83fad0054
[formerly 0e3876de34
] [formerly 4f734ae7f9
[formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]]
Former-commit-id: 4f734ae7f9
Former-commit-id: 732aaa6001
[formerly 044d086fc1
]
Former-commit-id: 4db3b99181
2014-05-06 13:09:12 -05:00
Nate Jensen
ad7a69f2e3
Issue #2060 fill in units on GridRecords created from URIs
...
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 3719c41d2b
[formerly 71b4227061
] [formerly 3719c41d2b
[formerly 71b4227061
] [formerly 7cea97ab15
[formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597
[formerly 6bdbfb7e1a
]
Former-commit-id: 66cd43313a
2014-05-06 12:26:21 -05:00
Brian Clements
3c9f5ff37b
Omaha #3116 changed log formatter class to match camel 2.12.3
...
Former-commit-id: 170ce2c157
[formerly c77ba25dc8
] [formerly 170ce2c157
[formerly c77ba25dc8
] [formerly 51eb6c9f06
[formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]]
Former-commit-id: 51eb6c9f06
Former-commit-id: 5b26766041
[formerly b8a648f543
]
Former-commit-id: ffc02d68d6
2014-05-06 11:38:38 -05:00
Richard Peter
4f6a9a0562
Issue #2726 : Autoset route startup order.
...
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: 8ae9cfba55
[formerly b148d11ec9
] [formerly 8ae9cfba55
[formerly b148d11ec9
] [formerly 4dc91f494f
[formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]]
Former-commit-id: 4dc91f494f
Former-commit-id: 7fe7b43ee2
[formerly c6719da76b
]
Former-commit-id: 4a140afac6
2014-05-06 09:46:41 -05:00
Brian Clements
89f3a0a1d2
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 729e717be1
[formerly f545c548cc
] [formerly 729e717be1
[formerly f545c548cc
] [formerly 1432aa1302
[formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: 8674841154
[formerly 5583c3903b
]
Former-commit-id: 3a60b0db05
2014-05-06 09:30:07 -05:00
Nate Jensen
c32e1bb9fe
Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
...
Former-commit-id: db4fc0c4d2
[formerly 7d11e31b06
] [formerly db4fc0c4d2
[formerly 7d11e31b06
] [formerly 596b5268d0
[formerly dee25d151cecf83f23d2ef9df20146c68069e957]]]
Former-commit-id: 596b5268d0
Former-commit-id: bff03681a4
[formerly bad26fdd7d
]
Former-commit-id: 7e521c3e0b
2014-05-05 16:58:44 -05:00
Lee Venable
46eb74e982
Issue #3109 - removed code that sets the Cave cursor.
...
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: 550668cbf7
[formerly a6c2260dd1
] [formerly 550668cbf7
[formerly a6c2260dd1
] [formerly b0a251f4e3
[formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a092fd45dc
[formerly 631a8d3cb1
]
Former-commit-id: f48d571cb6
2014-05-05 16:13:31 -05:00
Steve Harris
b8b5300a9b
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts (updated in ufcore):
cave/com.raytheon.uf.viz.application.feature/feature.xml
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: a8d3f4d885
[formerly 73ed3251bd
] [formerly a8d3f4d885
[formerly 73ed3251bd
] [formerly 83368e4b4e
[formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]
Former-commit-id: 83368e4b4e
Former-commit-id: ea24d1dadc
[formerly caadbd3dd9
]
Former-commit-id: 8cd5ed7a8e
2014-05-05 16:04:09 -05:00
Brian Clements
9c7f4cd887
Omaha #3061 only shared display capable clients get payload in invite
...
Former-commit-id: dec5159216
[formerly 1502354f87
] [formerly dec5159216
[formerly 1502354f87
] [formerly c61e30a422
[formerly 6595f5be37941f35c33b46231deef7d41e967380]]]
Former-commit-id: c61e30a422
Former-commit-id: 9d25e9dcb8
[formerly 58f45fa7d0
]
Former-commit-id: 1e3d29a3f3
2014-05-05 15:29:06 -05:00
Nate Jensen
d50f19d715
Issue #2060 fix sat precip for grid data URI removal
...
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: 2b6c30e67d
[formerly 0cf0f724f4
] [formerly 2b6c30e67d
[formerly 0cf0f724f4
] [formerly d82f6e5ff6
[formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]]
Former-commit-id: d82f6e5ff6
Former-commit-id: 09091ccf25
[formerly 97597c3ab1
]
Former-commit-id: 0840a62eb8
2014-05-05 13:06:08 -05:00
Dave Hladky
7e763a5a22
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 0ac4de6ad0
[formerly 333bf8b36d
] [formerly 0ac4de6ad0
[formerly 333bf8b36d
] [formerly ccaaa1cfea
[formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a
[formerly 7611339cd8
]
Former-commit-id: cb94f9fc97
2014-05-05 12:15:14 -05:00
Nate Jensen
3eaaf56f8e
Merge "Issue #2956 more safety checks" into omaha_14.3.1
...
Former-commit-id: f233d104d7
[formerly e9b3041170
] [formerly f233d104d7
[formerly e9b3041170
] [formerly d6518bede1
[formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]
Former-commit-id: d6518bede1
Former-commit-id: e8e971d434
[formerly 8ee8937daf
]
Former-commit-id: e8b7cec960
2014-05-05 09:45:11 -05:00
Brad Gonzales
8aca12b211
Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
...
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115
Former-commit-id: cbcd7dcc3e
[formerly df353f06f5
] [formerly cbcd7dcc3e
[formerly df353f06f5
] [formerly 39a2ec8f46
[formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]]
Former-commit-id: 39a2ec8f46
Former-commit-id: b33bd153f4
[formerly 78714c6ff7
]
Former-commit-id: 91caaba15c
2014-05-02 13:09:57 -05:00
Richard Peter
9326b9d125
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
...
Former-commit-id: f38816d168
[formerly dc0b598fd4
] [formerly f38816d168
[formerly dc0b598fd4
] [formerly 132d63ac44
[formerly 28b33188773001c34946464093319dc2a1117be9]]]
Former-commit-id: 132d63ac44
Former-commit-id: 8e141a137a
[formerly 5314b412b4
]
Former-commit-id: b9351199b8
2014-05-02 10:05:59 -05:00
Richard Peter
f34020dcc0
Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
...
Former-commit-id: 6bb353a05d
[formerly 51ba60d62b
] [formerly 6bb353a05d
[formerly 51ba60d62b
] [formerly 24f1c7b385
[formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]]
Former-commit-id: 24f1c7b385
Former-commit-id: 592e9171e1
[formerly 1f7e076018
]
Former-commit-id: 28c8c6357a
2014-05-02 10:05:29 -05:00
Richard Peter
7481634fdb
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
...
Former-commit-id: 4e1bc16d70
[formerly 478cedd3a3
] [formerly 4e1bc16d70
[formerly 478cedd3a3
] [formerly d4a138c534
[formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]
Former-commit-id: d4a138c534
Former-commit-id: 160ce06137
[formerly 1b7dd13525
]
Former-commit-id: 67eb0867ea
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
dd315aa9b8
Issue #3095 Update JGridData for creation of numeric java package.
...
Former-commit-id: 956f62a6ec
[formerly 6bdaba048c
] [formerly 956f62a6ec
[formerly 6bdaba048c
] [formerly 23d6da4a18
[formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]]
Former-commit-id: 23d6da4a18
Former-commit-id: d2c0499f2c
[formerly 3300d8c75c
]
Former-commit-id: c2a3dbe9af
2014-05-01 18:02:08 -05:00
Richard Peter
338b2c53d0
Issue #2854 : Pack commons.lang for alertviz
...
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: 1738b065b8
[formerly a9b088146c
] [formerly 1738b065b8
[formerly a9b088146c
] [formerly bcd87195ee
[formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]
Former-commit-id: bcd87195ee
Former-commit-id: 926cd5f6d1
[formerly e1a2767f8f
]
Former-commit-id: df422d1516
2014-05-01 16:30:21 -05:00
Nate Jensen
42a27546f9
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: d759efcaa8
[formerly f4d20c41f4
] [formerly d759efcaa8
[formerly f4d20c41f4
] [formerly 7d142d9d9d
[formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 6f211aa9f8
[formerly f3b68178bd
]
Former-commit-id: 3f9a33bf35
2014-05-01 16:28:16 -05:00
Nate Jensen
562a70b8fb
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
...
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 3222914fde
[formerly 137818d03a
] [formerly 3222914fde
[formerly 137818d03a
] [formerly a73a310709
[formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]
Former-commit-id: a73a310709
Former-commit-id: b245e49d53
[formerly 84dbedcff5
]
Former-commit-id: c7ddb6d476
2014-05-01 16:20:35 -05:00
Richard Peter
b8bdced87a
Issue #2854 : Fix features.
...
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: 25fd0e03f4
[formerly 4056f53fa2
] [formerly 25fd0e03f4
[formerly 4056f53fa2
] [formerly a4fb460e17
[formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]
Former-commit-id: a4fb460e17
Former-commit-id: f364f02f58
[formerly c3c7ebb146
]
Former-commit-id: 472077fbd5
2014-05-01 14:47:41 -05:00
Steve Harris
523cf536e2
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: 9ecd871825
[formerly c8ba70a146
] [formerly 9ecd871825
[formerly c8ba70a146
] [formerly 779e85cc77
[formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a6ab8c52f
[formerly bdf6d0b6be
]
Former-commit-id: d7c31fe4a9
2014-05-01 13:25:15 -05:00
Steve Harris
56bf68d145
Omaha #3085 - re-deleted stuff that was re-added in the merge from omaha_14.3.1 to omaha_14.4.1
...
Change-Id: Id13953881429545bccb590a550c23a73f77d585e
Former-commit-id: 11ca44c583
[formerly 70ee74a311
] [formerly 11ca44c583
[formerly 70ee74a311
] [formerly ab0b1ec047
[formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]]
Former-commit-id: ab0b1ec047
Former-commit-id: beba75f87c
[formerly 579eb6e47a
]
Former-commit-id: 64849d50ec
2014-05-01 12:53:06 -05:00
Nate Jensen
7c748842f0
Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
...
Former-commit-id: ba9ed2aba3
[formerly b7536a398b
] [formerly ba9ed2aba3
[formerly b7536a398b
] [formerly 96071c250d
[formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]]
Former-commit-id: 96071c250d
Former-commit-id: dbca36c2bc
[formerly 4c2923246a
]
Former-commit-id: 704eff96aa
2014-05-01 12:40:41 -05:00
Brian Clements
36b2419ff1
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: 93912625ea
[formerly 3ca4f8cc52
] [formerly 93912625ea
[formerly 3ca4f8cc52
] [formerly dd5412e119
[formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]
Former-commit-id: dd5412e119
Former-commit-id: 3fd504f1de
[formerly 2337d5ef56
]
Former-commit-id: c7cea4b5f7
2014-05-01 12:34:09 -05:00
Bryan Kowal
10a57d5299
Issue #3099 - handle empty location name lists in the data request
...
Former-commit-id: ff21ef813c
[formerly 5eac78f0e0
] [formerly ff21ef813c
[formerly 5eac78f0e0
] [formerly a9b9a8b8c4
[formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]]
Former-commit-id: a9b9a8b8c4
Former-commit-id: 4775dc1f40
[formerly 2079aec2bb
]
Former-commit-id: bf24af6980
2014-05-01 12:12:42 -05:00
Nate Jensen
8961b7305e
Merge "Issue #2854 : Reorganize deltaScripts" into omaha_14.3.1
...
Former-commit-id: 1d157a16e3
[formerly 7fbdb9ff83
] [formerly 1d157a16e3
[formerly 7fbdb9ff83
] [formerly bcb82bedc6
[formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]]
Former-commit-id: bcb82bedc6
Former-commit-id: 037fe502d7
[formerly e5eb1ab87e
]
Former-commit-id: 1b78d60b52
2014-05-01 12:06:13 -05:00
Nate Jensen
1f294864f0
Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
...
Former-commit-id: 03b412c136
[formerly b28e5291d6
] [formerly 03b412c136
[formerly b28e5291d6
] [formerly 244183db25
[formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]]
Former-commit-id: 244183db25
Former-commit-id: 59623a97d0
[formerly 02059a512f
]
Former-commit-id: 800ee1a68c
2014-05-01 11:21:54 -05:00
Nate Jensen
4669a93a96
Issue #3101 safe cast numpy shape values to Number
...
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c
Former-commit-id: 7b2ed421f0
[formerly 2a0775e748
] [formerly 7b2ed421f0
[formerly 2a0775e748
] [formerly 76ad31501b
[formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]]
Former-commit-id: 76ad31501b
Former-commit-id: ffb294cab4
[formerly 191f6c3385
]
Former-commit-id: ee285cfc57
2014-05-01 11:01:37 -05:00
Dave Hladky
a520e57f73
Issue #2992 Missed perl script
...
Former-commit-id: 9a43ac36e6
[formerly 23433f628d
] [formerly 9a43ac36e6
[formerly 23433f628d
] [formerly 904a608495
[formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]]
Former-commit-id: 904a608495
Former-commit-id: bc4067c5d8
[formerly dbe4f68100
]
Former-commit-id: 741e809c95
2014-05-01 08:48:38 -05:00
Greg Armendariz
4066e1c518
Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
...
Former-commit-id: 2994753636
[formerly 1e48076fb2
] [formerly 2994753636
[formerly 1e48076fb2
] [formerly 58eaf444bd
[formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]]
Former-commit-id: 58eaf444bd
Former-commit-id: 9f6eff005b
[formerly e1d91769fe
]
Former-commit-id: 733b64a851
2014-04-30 19:34:43 -05:00
Brian Clements
4c1a6b44c8
Issue #2903 set commons.lang to unpack in feature to fix odd bug
...
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help
Former-commit-id: fee0a858cb
[formerly 873efa1c64
] [formerly fee0a858cb
[formerly 873efa1c64
] [formerly f45e435f2c
[formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: 20830253ba
[formerly c187523782
]
Former-commit-id: c3d2b4be86
2014-04-30 17:52:43 -05:00
Richard Peter
cfb980db11
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
...
Former-commit-id: d28c4fdbae
[formerly de9eb60629
] [formerly d28c4fdbae
[formerly de9eb60629
] [formerly 86ddd480c1
[formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: d961ff6edc
[formerly 6ecb5018b6
]
Former-commit-id: dd54408a10
2014-04-30 17:43:50 -05:00