Bug 1389681

+++ This bug was initially created as a clone of Bug #1309545 +++

Description:
`oc edit` for multiple resources does not edit in one file. But this worked before.

Version-Release number of selected component (if applicable):
openshift/oc v1.1.3-32-g5ab601a
kubernetes v1.2.0-alpha.7-703-gbc4550d


How reproducible:
Always

Steps to Reproduce:
1. oc login, create a project
2. Create new app
$ oc new-app -f origin/examples/sample-app/application-template-stibuild.jsono
3. Edit multiple resources
1> $ oc edit svc # There are services: frontend and database
2> $ oc edit svc/database dc/database

Actual results:
3.
1> It just edits one resource per file. Press ":wq", it then edits another resource. (This is not convenient. If there are N services and run `oc edit svc`, then need press N times of ":q" to abort edit)
2> Same as 3.1

Expected results:
3. It should edit all resources in one single file as it did in old version of oc.

Additional info:
Seems kubernetes v1.1.0... works well, but kubernetes v1.2.0... works badly.
Here are some other test results:
`oc edit svc/database dc/database` works well when versions are:
oc v1.1-630-gb197d32
kubernetes v1.1.0-origin-1107-g4c8e6f4

Or:
oc v3.1.1.6
kubernetes v1.1.0-origin-1107-g4c8e6f4

Works badly when versions are:
oc v1.1.2-285-gb39b3d8
kubernetes v1.2.0-origin

Or:
oc v3.1.1.902
kubernetes v1.2.0-origin

--- Additional comment from David Eads on 2016-02-18 09:24:27 EST ---

Upstream fix: https://github.com/kubernetes/kubernetes/pull/20918

--- Additional comment from David Eads on 2016-02-19 14:24:11 EST ---

Per Clayton, the fix won't make this release.  Marking for upcoming.

--- Additional comment from Michal Fojtik on 2016-05-31 08:27:01 EDT ---

Waiting for the next rebase to pick this up. Since it will probably slip the 3.2.1, we should set it as upcoming release.

--- Additional comment from Xingxing Xia on 2016-06-16 22:01:45 EDT ---

FYI, there comes a RFE in bug 1347365

--- Additional comment from Javier Ramirez on 2016-06-24 05:45:28 EDT ---



--- Additional comment from Xingxing Xia on 2016-07-25 05:05:48 EDT ---

Checked the PR in comment 1 is merged in latest AMI oc version:
$ oc version
oc v1.3.0-alpha.2+5c862c0
kubernetes v1.3.0+57fb9ac

$ cd github.com/openshift/kubernetes
$ git log --pretty="%h %cd - %s" --date=local 57fb9ac | grep "#20918"
6936b9f Sun May 22 22:12:18 2016 - Merge pull request #20918 from deads2k/fix-list-edit

The issue is fixed. `oc edit` could edit all resources in one single file as it did.
So could move to ON_QA if it is suitable. Thank you.

--- Additional comment from David Eads on 2016-07-25 07:32:34 EDT ---

Upstream rebased into origin.