Commit graph

17 commits

Author SHA1 Message Date
Matt Nash
825570f37c Issue added work on the chat for presence notifications
Former-commit-id: d264743199 [formerly d264743199 [formerly ead836fb1bc7f5843a29dc26cf3d634c80e22a81]]
Former-commit-id: 6f354374d6
Former-commit-id: 4f35191a6b
2012-03-08 09:08:41 -06:00
Matt Nash
9ec70444da Merge "Issue update" into 11-Collaboration
Former-commit-id: 04ae9b48ea [formerly 04ae9b48ea [formerly f1c93e1e97f5f6cc2cf8b4d9a0d14ea93863d173]]
Former-commit-id: bbacd337b4
Former-commit-id: 7efd993e18
2012-03-08 08:33:32 -06:00
Roger Ferrel
890f2bffb9 Issue update
Change-Id: I6f92dbd64d95cc853f6dcf43d39c209607a70105

Former-commit-id: c9459e2e8c [formerly c9459e2e8c [formerly 28969960d80066def0ef02930875e40d7693c234]]
Former-commit-id: 2114b95a0b
Former-commit-id: 1a2608a2fa
2012-03-08 08:30:02 -06:00
James Korman
e40ee702aa Issue Initial collaboration framework plugin checkin
Former-commit-id: 526a2633ce [formerly 526a2633ce [formerly 2351a53e68bbc8cfe11917d202cbc5424768b5a6]]
Former-commit-id: 5a91d71c12
Former-commit-id: 2fea86a591
2012-03-07 15:38:20 -06:00
Nate Jensen
54ab82c837 Merge "Issue Inital creation" into 11-Collaboration
Former-commit-id: f950b30463 [formerly f950b30463 [formerly 3a87a9a75f96d72a3f4bb378f9d2c913b441a5e3]]
Former-commit-id: 412ceb9561
Former-commit-id: d0672cf2b6
2012-03-06 14:27:15 -06:00
Roger Ferrel
8395a3937e Issue Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: c26e98376e [formerly c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]
Former-commit-id: 3161380f4d
Former-commit-id: ccfadae952
2012-03-06 14:08:39 -06:00
Steve Harris
15c56d11bc Merging SS OB12.2.1 into ss_sync
Former-commit-id: c8aae98741 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
2012-02-22 11:14:43 -06:00
Steve Harris
156ad8471d Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 94c2ea985b [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 9995d22e25
Former-commit-id: aaead73ec5
2012-02-22 10:12:49 -06:00
Steve Harris
895404abeb Manual merge of SS OB12.1.2-4 changes into ss_sync
Former-commit-id: 93f6535bd8 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]
Former-commit-id: b137302802
Former-commit-id: 65b22abd24
2012-02-17 10:55:02 -06:00
Nate Jensen
076ceafddf Issue fix ncep
Change-Id: If0e2947c33523ada50036212666867a7c5138c17

Former-commit-id: ca923b9475 [formerly ca923b9475 [formerly 8d7433be62e5b815d012b330c31fe069db16b5b4]]
Former-commit-id: 15e0a5e68d
Former-commit-id: 29be9b82bd
2012-01-26 17:28:06 -06:00
Roger Ferrel
df778176a5 Issue
new files not indexed


Former-commit-id: 472e788dba [formerly 472e788dba [formerly 6e2032f9290e77e8e597ae4256ffe7ad8142407b]]
Former-commit-id: 69f8daedff
Former-commit-id: c6f2b90560
2012-01-26 14:37:19 -06:00
Roger Ferrel
e20f37b19b Issue
The January ncep_build/build.cave changes

Former-commit-id: f00f3dd332 [formerly f00f3dd332 [formerly 29b4a3313d4cefd56f9697a31a767a9780de75a1]]
Former-commit-id: 750b17a81c
Former-commit-id: cbd8827872
2012-01-26 11:25:39 -06:00
Roger Ferrel
0d2ef82d19 Issue
Changes from January ncep_cave

Former-commit-id: 7427aeaf29 [formerly 7427aeaf29 [formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]
Former-commit-id: fa42f2dc60
Former-commit-id: 376f6868b6
2012-01-26 09:26:07 -06:00
Nate Jensen
ef5349fb63 Issue integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: fe52a35f7a [formerly fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]
Former-commit-id: 33756de9c8
Former-commit-id: 3b7a082f41
2012-01-24 09:59:50 -06:00
Bryan Kowal
3bcecdfe66 Issue - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2142afe3f1 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 2a7b92ec91
2012-01-20 11:37:38 -06:00
Matt Nash
21d2361f00 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
377dcd10b9 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00