----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/10010/#review18094 -----------------------------------------------------------
This patch does not apply to 4.1: # git am ~/Downloads/0001-CLOUDSTACK-198-Included-VpnUsers-in-Add-state-while-.patch Applying: CLOUDSTACK-198: Included VpnUsers in Add state while listing. Added state to Vpn user response. error: patch failed: api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java:33 error: api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java: patch does not apply error: patch failed: setup/db/db/schema-40to410.sql:261 error: setup/db/db/schema-40to410.sql: patch does not apply Patch failed at 0001 CLOUDSTACK-198: Included VpnUsers in Add state while listing. Added state to Vpn user response. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". - Chip Childers On March 19, 2013, 12:58 p.m., Kishan Kavala wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/10010/ > ----------------------------------------------------------- > > (Updated March 19, 2013, 12:58 p.m.) > > > Review request for cloudstack and Chip Childers. > > > Description > ------- > > Included VpnUsers in Add state while listing. Added state to Vpn user response > > > This addresses bug CLOUDSTACK-198. > > > Diffs > ----- > > api/src/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java > 79c34d0 > api/src/org/apache/cloudstack/api/response/VpnUsersResponse.java e654e8a > server/src/com/cloud/api/ApiResponseHelper.java 8c97615 > server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java 82c0015 > setup/db/db/schema-40to410.sql c8a7a61 > > Diff: https://reviews.apache.org/r/10010/diff/ > > > Testing > ------- > > Tested listVpnUsers API with VPN users in Add state. > Unit tests passed. > > > Thanks, > > Kishan Kavala > >